diff options
author | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-10-17 12:04:13 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2009-10-26 14:13:07 +0100 |
commit | 4c822bcfd94d9ab3cd59ddc5c91f505219479cb1 (patch) | |
tree | 339bf11a45565befc3aaa6142531d2ff16618b21 | |
parent | 941e95d2acb01c9aeb1999ac7525cdb036ce4c87 (diff) | |
download | ptxdist-4c822bcfd94d9ab3cd59ddc5c91f505219479cb1.tar.gz ptxdist-4c822bcfd94d9ab3cd59ddc5c91f505219479cb1.tar.xz |
[libtheora] use automatic autogen instead of autogen patch
Use own autogen.sh and call it with --help to avoid an included configure run.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rwxr-xr-x | patches/libtheora-1.0/autogen.sh | 4 | ||||
-rw-r--r-- | patches/libtheora-1.0/libtheora-1.0beta3-autogen.diff | 13594 | ||||
-rw-r--r-- | patches/libtheora-1.0/series | 1 |
3 files changed, 4 insertions, 13595 deletions
diff --git a/patches/libtheora-1.0/autogen.sh b/patches/libtheora-1.0/autogen.sh new file mode 100755 index 000000000..f2a0d7c3a --- /dev/null +++ b/patches/libtheora-1.0/autogen.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +./autogen.sh --help + diff --git a/patches/libtheora-1.0/libtheora-1.0beta3-autogen.diff b/patches/libtheora-1.0/libtheora-1.0beta3-autogen.diff deleted file mode 100644 index bef1a44ab..000000000 --- a/patches/libtheora-1.0/libtheora-1.0beta3-autogen.diff +++ /dev/null @@ -1,13594 +0,0 @@ -From: Robert Schwebel <r.schwebel@pengutronix.de> -Subject: libtheora: re-create autogenerated files - -Recreate files after configure.ac changes. This patch is not intended -for upstream. - -Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> - ---- - ---- - Makefile.in | 181 - - aclocal.m4 | 910 ++++++--- - config.h.in | 9 - configure | 4288 ++++++++++++++++++--------------------------- - doc/Makefile.in | 166 - - doc/spec/Makefile.in | 157 - - examples/Makefile.in | 212 +- - include/Makefile.in | 159 - - include/theora/Makefile.in | 131 - - lib/Makefile.in | 442 ++-- - m4/Makefile.in | 114 - - tests/Makefile.in | 283 +- - 12 files changed, 3323 insertions(+), 3729 deletions(-) - -Index: libtheora-1.0/aclocal.m4 -=================================================================== ---- libtheora-1.0.orig/aclocal.m4 -+++ libtheora-1.0/aclocal.m4 -@@ -1,7 +1,7 @@ --# generated automatically by aclocal 1.9.6 -*- Autoconf -*- -+# generated automatically by aclocal 1.10.1 -*- Autoconf -*- - - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, --# 2005 Free Software Foundation, Inc. -+# 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, - # with or without modifications, as long as this notice is preserved. -@@ -11,9 +11,17 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - -+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. -+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'.])]) -+ - # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- - --# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL -+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL - - - # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -@@ -101,7 +109,6 @@ AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl - AC_REQUIRE([AC_OBJEXT])dnl - AC_REQUIRE([AC_EXEEXT])dnl - dnl -- - AC_LIBTOOL_SYS_MAX_CMD_LEN - AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE - AC_LIBTOOL_OBJDIR -@@ -176,7 +183,7 @@ test -z "$STRIP" && STRIP=: - test -z "$ac_objext" && ac_objext=o - - # Determine commands to create old-style static archives. --old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' -+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' - old_postinstall_cmds='chmod 644 $oldlib' - old_postuninstall_cmds= - -@@ -203,6 +210,8 @@ file_magic*) - ;; - esac - -+_LT_REQUIRED_DARWIN_CHECKS -+ - AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) - AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], - enable_win32_dll=yes, enable_win32_dll=no) -@@ -263,8 +272,9 @@ cc_basename=`$echo "X$cc_temp" | $Xsed - - # Check for compiler boilerplate output or warnings with - # the simple compiler test code. - AC_DEFUN([_LT_COMPILER_BOILERPLATE], --[ac_outfile=conftest.$ac_objext --printf "$lt_simple_compile_test_code" >conftest.$ac_ext -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext - eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_compiler_boilerplate=`cat conftest.err` - $rm conftest* -@@ -276,13 +286,85 @@ $rm conftest* - # Check for linker boilerplate output or warnings with - # the simple link test code. - AC_DEFUN([_LT_LINKER_BOILERPLATE], --[ac_outfile=conftest.$ac_objext --printf "$lt_simple_link_test_code" >conftest.$ac_ext -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_link_test_code" >conftest.$ac_ext - eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_linker_boilerplate=`cat conftest.err` --$rm conftest* -+$rm -r conftest* - ])# _LT_LINKER_BOILERPLATE - -+# _LT_REQUIRED_DARWIN_CHECKS -+# -------------------------- -+# Check for some things on darwin -+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ -+ case $host_os in -+ rhapsody* | darwin*) -+ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) -+ AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) -+ -+ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], -+ [lt_cv_apple_cc_single_mod=no -+ if test -z "${LT_MULTI_MODULE}"; then -+ # By default we will add the -single_module flag. You can override -+ # by either setting the environment variable LT_MULTI_MODULE -+ # non-empty at configure time, or by adding -multi_module to the -+ # link flags. -+ echo "int foo(void){return 1;}" > conftest.c -+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -+ -dynamiclib ${wl}-single_module conftest.c -+ if test -f libconftest.dylib; then -+ lt_cv_apple_cc_single_mod=yes -+ rm -rf libconftest.dylib* -+ fi -+ rm conftest.c -+ fi]) -+ AC_CACHE_CHECK([for -exported_symbols_list linker flag], -+ [lt_cv_ld_exported_symbols_list], -+ [lt_cv_ld_exported_symbols_list=no -+ save_LDFLAGS=$LDFLAGS -+ echo "_main" > conftest.sym -+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], -+ [lt_cv_ld_exported_symbols_list=yes], -+ [lt_cv_ld_exported_symbols_list=no]) -+ LDFLAGS="$save_LDFLAGS" -+ ]) -+ case $host_os in -+ rhapsody* | darwin1.[[0123]]) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -+ darwin1.*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ darwin*) -+ # if running on 10.5 or later, the deployment target defaults -+ # to the OS version, if on x86, and 10.4, the deployment -+ # target defaults to 10.4. Don't you love it? -+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in -+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ 10.[[012]]*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ 10.*) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ esac -+ ;; -+ esac -+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then -+ _lt_dar_single_mod='$single_module' -+ fi -+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then -+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' -+ else -+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" -+ fi -+ if test "$DSYMUTIL" != ":"; then -+ _lt_dsymutil="~$DSYMUTIL \$lib || :" -+ else -+ _lt_dsymutil= -+ fi -+ ;; -+ esac -+]) - - # _LT_AC_SYS_LIBPATH_AIX - # ---------------------- -@@ -293,12 +375,20 @@ $rm conftest* - # If we don't find anything, use the default library path according - # to the aix ld manual. - AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], --[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'` -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -+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 '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'`; fi],[]) -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi],[]) - if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - ])# _LT_AC_SYS_LIBPATH_AIX - -@@ -529,13 +619,17 @@ ia64-*-hpux*) - rm -rf conftest* - ;; - --x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) -+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -+s390*-*linux*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in -+ x86_64-*kfreebsd*-gnu) -+ LD="${LD-ld} -m elf_i386_fbsd" -+ ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; -@@ -552,6 +646,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li - ;; - *64-bit*) - case $host in -+ x86_64-*kfreebsd*-gnu) -+ LD="${LD-ld} -m elf_x86_64_fbsd" -+ ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; -@@ -592,7 +689,11 @@ sparc*-*solaris*) - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; -- *) LD="${LD-ld} -64" ;; -+ *) -+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then -+ LD="${LD-ld} -64" -+ fi -+ ;; - esac - ;; - esac -@@ -623,7 +724,7 @@ AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], - AC_CACHE_CHECK([$1], [$2], - [$2=no - ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. -@@ -664,11 +765,12 @@ fi - # ------------------------------------------------------------ - # Check whether the given compiler option works - AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], --[AC_CACHE_CHECK([$1], [$2], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_CACHE_CHECK([$1], [$2], - [$2=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $3" -- printf "$lt_simple_link_test_code" > conftest.$ac_ext -+ echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings -@@ -684,7 +786,7 @@ AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], - $2=yes - fi - fi -- $rm conftest* -+ $rm -r conftest* - LDFLAGS="$save_LDFLAGS" - ]) - -@@ -782,24 +884,27 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d - fi - ;; - *) -- # If test is not a shell built-in, we'll probably end up computing a -- # maximum length that is only half of the actual maximum length, but -- # we can't tell. -- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} -- while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ -+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` -+ if test -n "$lt_cv_sys_max_cmd_len"; then -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` -+ else -+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} -+ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ - = "XX$teststring") >/dev/null 2>&1 && -- new_result=`expr "X$teststring" : ".*" 2>&1` && -- lt_cv_sys_max_cmd_len=$new_result && -- test $i != 17 # 1/2 MB should be enough -- do -- i=`expr $i + 1` -- teststring=$teststring$teststring -- done -- teststring= -- # Add a significant safety factor because C++ compilers can tack on massive -- # amounts of additional arguments before passing them to the linker. -- # It appears as though 1/2 is a usable value. -- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` -+ new_result=`expr "X$teststring" : ".*" 2>&1` && -+ lt_cv_sys_max_cmd_len=$new_result && -+ test $i != 17 # 1/2 MB should be enough -+ do -+ i=`expr $i + 1` -+ teststring=$teststring$teststring -+ done -+ teststring= -+ # Add a significant safety factor because C++ compilers can tack on massive -+ # amounts of additional arguments before passing them to the linker. -+ # It appears as though 1/2 is a usable value. -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` -+ fi - ;; - esac - ]) -@@ -952,7 +1057,7 @@ else - AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], - [AC_CHECK_LIB([dld], [shl_load], -- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], -+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], - [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], - [AC_CHECK_LIB([dl], [dlopen], -@@ -960,7 +1065,7 @@ else - [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], - [AC_CHECK_LIB([dld], [dld_link], -- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) -+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) - ]) - ]) - ]) -@@ -1026,7 +1131,8 @@ fi - # --------------------------------- - # Check to see if options -c and -o are simultaneously supported by compiler - AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], --[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl - AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], - [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], - [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no -@@ -1034,7 +1140,7 @@ AC_CACHE_CHECK([if $compiler supports -c - mkdir conftest - cd conftest - mkdir out -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or -@@ -1174,6 +1280,7 @@ else - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" -+ old_striplib="$STRIP -S" - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) -@@ -1191,7 +1298,8 @@ fi - # ----------------------------- - # PORTME Fill in your ld.so characteristics - AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], --[AC_MSG_CHECKING([dynamic linker characteristics]) -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_MSG_CHECKING([dynamic linker characteristics]) - library_names_spec= - libname_spec='lib$name' - soname_spec= -@@ -1205,20 +1313,58 @@ shlibpath_overrides_runpath=unknown - version_type=none - dynamic_linker="$host_os ld.so" - sys_lib_dlsearch_path_spec="/lib /usr/lib" -+m4_if($1,[],[ - if test "$GCC" = yes; then -- 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 ';' >/dev/null ; 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. -- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ lt_search_path_spec=`echo "$lt_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"` -+ 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 -+fi]) - need_lib_prefix=unknown - hardcode_into_libs=no - -@@ -1236,7 +1382,7 @@ aix3*) - soname_spec='${libname}${release}${shared_ext}$major' - ;; - --aix4* | aix5*) -+aix[[4-9]]*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -1375,12 +1521,8 @@ darwin* | rhapsody*) - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. -- if test "$GCC" = yes; then -- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` -- else -- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' -- fi -+ m4_if([$1], [],[ -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -@@ -1434,7 +1576,7 @@ freebsd* | dragonfly*) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; -- freebsd*) # from 4.6 on -+ *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; -@@ -1497,7 +1639,7 @@ hpux9* | hpux10* | hpux11*) - postinstall_cmds='chmod 555 $lib' - ;; - --interix3*) -+interix[[3-9]]*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -1568,7 +1710,7 @@ linux* | k*bsd*-gnu) - - # 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)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -+ 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 - -@@ -1674,6 +1816,10 @@ osf3* | osf4* | osf5*) - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -+rdos*) -+ dynamic_linker=no -+ ;; -+ - solaris*) - version_type=linux - need_lib_prefix=no -@@ -1769,6 +1915,13 @@ esac - AC_MSG_RESULT([$dynamic_linker]) - test "$dynamic_linker" = no && can_build_shared=no - -+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], -+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], -+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+ - variables_saved_for_relink="PATH $shlibpath_var $runpath_var" - if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -@@ -1779,7 +1932,8 @@ fi - # _LT_AC_TAGCONFIG - # ---------------- - AC_DEFUN([_LT_AC_TAGCONFIG], --[AC_ARG_WITH([tags], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_ARG_WITH([tags], - [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], - [include additional configurations @<:@automatic@:>@])], - [tagnames="$withval"]) -@@ -2040,7 +2194,7 @@ m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC - - # AC_PATH_TOOL_PREFIX - # ------------------- --# find a file program which can recognise shared library -+# find a file program which can recognize shared library - AC_DEFUN([AC_PATH_TOOL_PREFIX], - [AC_REQUIRE([AC_PROG_EGREP])dnl - AC_MSG_CHECKING([for $1]) -@@ -2103,7 +2257,7 @@ fi - - # AC_PATH_MAGIC - # ------------- --# find a file program which can recognise a shared library -+# find a file program which can recognize a shared library - AC_DEFUN([AC_PATH_MAGIC], - [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) - if test -z "$lt_cv_path_MAGIC_CMD"; then -@@ -2250,7 +2404,7 @@ esac - # how to check for library dependencies - # -- PORTME fill in with the dynamic library characteristics - AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], --[AC_CACHE_CHECK([how to recognise dependent libraries], -+[AC_CACHE_CHECK([how to recognize dependent libraries], - lt_cv_deplibs_check_method, - [lt_cv_file_magic_cmd='$MAGIC_CMD' - lt_cv_file_magic_test_file= -@@ -2267,7 +2421,7 @@ lt_cv_deplibs_check_method='unknown' - # whether `pass_all' will *always* work, you probably want this one. - - case $host_os in --aix4* | aix5*) -+aix[[4-9]]*) - lt_cv_deplibs_check_method=pass_all - ;; - -@@ -2289,9 +2443,15 @@ cygwin*) - - mingw* | pw32*) - # Base MSYS/MinGW do not provide the 'file' command needed by -- # func_win32_libid shell function, so use a weaker test based on 'objdump'. -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -- lt_cv_file_magic_cmd='$OBJDUMP -f' -+ # func_win32_libid shell function, so use a weaker test based on 'objdump', -+ # unless we find 'file', for example because we are cross-compiling. -+ if ( file / ) >/dev/null 2>&1; then -+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' -+ lt_cv_file_magic_cmd='func_win32_libid' -+ else -+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ lt_cv_file_magic_cmd='$OBJDUMP -f' -+ fi - ;; - - darwin* | rhapsody*) -@@ -2336,7 +2496,7 @@ hpux10.20* | hpux11*) - esac - ;; - --interix3*) -+interix[[3-9]]*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' - ;; -@@ -2386,6 +2546,10 @@ osf3* | osf4* | osf5*) - lt_cv_deplibs_check_method=pass_all - ;; - -+rdos*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ - solaris*) - lt_cv_deplibs_check_method=pass_all - ;; -@@ -2438,7 +2602,7 @@ AC_DEFUN([AC_PROG_NM], - lt_cv_path_NM="$NM" - else - lt_nm_to_check="${ac_tool_prefix}nm" -- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then -+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then - lt_nm_to_check="$lt_nm_to_check nm" - fi - for lt_tmp_nm in $lt_nm_to_check; do -@@ -2654,10 +2818,10 @@ objext=o - _LT_AC_TAGVAR(objext, $1)=$objext - - # Code to be used in simple compile tests --lt_simple_compile_test_code="int some_variable = 0;\n" -+lt_simple_compile_test_code="int some_variable = 0;" - - # Code to be used in simple link tests --lt_simple_link_test_code='int main(){return(0);}\n' -+lt_simple_link_test_code='int main(){return(0);}' - - _LT_AC_SYS_COMPILER - -@@ -2693,7 +2857,7 @@ aix3*) - fi - ;; - --aix4* | aix5*) -+aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi -@@ -2750,6 +2914,7 @@ _LT_AC_TAGVAR(postdep_objects, $1)= - _LT_AC_TAGVAR(predeps, $1)= - _LT_AC_TAGVAR(postdeps, $1)= - _LT_AC_TAGVAR(compiler_lib_search_path, $1)= -+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= - - # Source file extension for C++ test sources. - ac_ext=cpp -@@ -2759,10 +2924,10 @@ objext=o - _LT_AC_TAGVAR(objext, $1)=$objext - - # Code to be used in simple compile tests --lt_simple_compile_test_code="int some_variable = 0;\n" -+lt_simple_compile_test_code="int some_variable = 0;" - - # Code to be used in simple link tests --lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n' -+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_AC_SYS_COMPILER -@@ -2859,7 +3024,7 @@ case $host_os in - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -- aix4* | aix5*) -+ aix[[4-9]]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. -@@ -2872,7 +3037,7 @@ case $host_os in - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. -- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) -+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) -@@ -2908,7 +3073,7 @@ case $host_os in - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ : - else - # We have old collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported -@@ -3018,59 +3183,31 @@ case $host_os in - fi - ;; - darwin* | rhapsody*) -- case $host_os in -- rhapsody* | darwin1.[[012]]) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' -- ;; -- *) # Darwin 1.3 on -- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -- else -- case ${MACOSX_DEPLOYMENT_TARGET} in -- 10.[[012]]) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -- ;; -- 10.*) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' -- ;; -- esac -- fi -- ;; -- esac - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -- -- if test "$GXX" = yes ; then -- lt_int_apple_cc_single_mod=no -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" -+ if test "$GXX" = yes ; then - output_verbose_link_cmd='echo' -- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then -- lt_int_apple_cc_single_mod=yes -+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ if test "$lt_cv_apple_cc_single_mod" != "yes"; then -+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" - fi -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- else -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- fi -- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- else -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- fi -- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) -@@ -3153,9 +3290,7 @@ case $host_os in - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - case $host_cpu in -- hppa*64*|ia64*) -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' -- ;; -+ hppa*64*|ia64*) ;; - *) - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; -@@ -3223,7 +3358,7 @@ case $host_os in - ;; - esac - ;; -- interix3*) -+ interix[[3-9]]*) - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -@@ -3315,7 +3450,7 @@ case $host_os in - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; -- pgCC*) -+ pgCC* | pgcpp*) - # Portland Group C++ compiler - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -@@ -3343,6 +3478,29 @@ case $host_os in - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ -+ # Not sure whether something based on -+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 -+ # would be better. -+ output_verbose_link_cmd='echo' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -xar", where "CC" is the Sun C++ compiler. This is -+ # necessary to make sure instantiated templates are included -+ # in the archive. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' -+ ;; -+ esac -+ ;; - esac - ;; - lynxos*) -@@ -3381,16 +3539,20 @@ case $host_os in - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - openbsd*) -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ if test -f /usr/libexec/ld.so; then -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ fi -+ output_verbose_link_cmd='echo' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi -- output_verbose_link_cmd='echo' - ;; - osf3*) - case $cc_basename in -@@ -3552,15 +3714,10 @@ case $host_os in - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) -- # The C++ compiler is used as linker so we must use $wl -- # flag to pass the commands to the underlying system -- # linker. We must also pass each convience library through -- # to the system linker between allextract/defaultextract. -- # The C++ compiler will combine linker options so we -- # cannot just pass the convience library names through -- # without $wl. -+ # The compiler driver will combine and reorder linker options, -+ # but understands `-z linker_flag'. - # Supported since Solaris 2.6 (maybe 2.5.1?) -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - ;; - esac - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -@@ -3607,6 +3764,12 @@ case $host_os in - fi - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' -+ case $host_os in -+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -+ *) -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ ;; -+ esac - fi - ;; - esac -@@ -3722,7 +3885,8 @@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld - # compiler output when linking a shared library. - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. --AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ -+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl - dnl we can't use the lt_simple_compile_test_code here, - dnl because it contains code intended for an executable, - dnl not a library. It's possible we should let each -@@ -3847,10 +4011,15 @@ fi - - $rm -f confest.$objext - -+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= -+if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then -+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -+fi -+ - # PORTME: override above test on systems where it is broken - ifelse([$1],[CXX], - [case $host_os in --interix3*) -+interix[[3-9]]*) - # Interix 3.5 installs completely hosed .la files for C++, so rather than - # hack all around it, let's just trust "g++" to DTRT. - _LT_AC_TAGVAR(predep_objects,$1)= -@@ -3858,19 +4027,51 @@ interix3*) - _LT_AC_TAGVAR(postdeps,$1)= - ;; - -+linux*) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ # -+ # The more standards-conforming stlport4 library is -+ # incompatible with the Cstd library. Avoid specifying -+ # it if it's in CXXFLAGS. Ignore libCrun as -+ # -library=stlport4 depends on it. -+ case " $CXX $CXXFLAGS " in -+ *" -library=stlport4 "*) -+ solaris_use_stlport4=yes -+ ;; -+ esac -+ if test "$solaris_use_stlport4" != yes; then -+ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' -+ fi -+ ;; -+ esac -+ ;; -+ - solaris*) - case $cc_basename in - CC*) -+ # The more standards-conforming stlport4 library is -+ # incompatible with the Cstd library. Avoid specifying -+ # it if it's in CXXFLAGS. Ignore libCrun as -+ # -library=stlport4 depends on it. -+ case " $CXX $CXXFLAGS " in -+ *" -library=stlport4 "*) -+ solaris_use_stlport4=yes -+ ;; -+ esac -+ - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. -- _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun' -+ if test "$solaris_use_stlport4" != yes; then -+ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' -+ fi - ;; - esac - ;; - esac - ]) -- - case " $_LT_AC_TAGVAR(postdeps, $1) " in - *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; - esac -@@ -3913,10 +4114,17 @@ objext=o - _LT_AC_TAGVAR(objext, $1)=$objext - - # Code to be used in simple compile tests --lt_simple_compile_test_code=" subroutine t\n return\n end\n" -+lt_simple_compile_test_code="\ -+ subroutine t -+ return -+ end -+" - - # Code to be used in simple link tests --lt_simple_link_test_code=" program t\n end\n" -+lt_simple_link_test_code="\ -+ program t -+ end -+" - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_AC_SYS_COMPILER -@@ -3948,7 +4156,7 @@ aix3*) - postinstall_cmds='$RANLIB $lib' - fi - ;; --aix4* | aix5*) -+aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi -@@ -3995,10 +4203,10 @@ objext=o - _LT_AC_TAGVAR(objext, $1)=$objext - - # Code to be used in simple compile tests --lt_simple_compile_test_code="class foo {}\n" -+lt_simple_compile_test_code="class foo {}" - - # Code to be used in simple link tests --lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n' -+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_AC_SYS_COMPILER -@@ -4051,7 +4259,7 @@ objext=o - _LT_AC_TAGVAR(objext, $1)=$objext - - # Code to be used in simple compile tests --lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' -+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' - - # Code to be used in simple link tests - lt_simple_link_test_code="$lt_simple_compile_test_code" -@@ -4125,6 +4333,7 @@ if test -f "$ltmain"; then - _LT_AC_TAGVAR(predeps, $1) \ - _LT_AC_TAGVAR(postdeps, $1) \ - _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ -+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \ - _LT_AC_TAGVAR(archive_cmds, $1) \ - _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ - _LT_AC_TAGVAR(postinstall_cmds, $1) \ -@@ -4140,6 +4349,7 @@ if test -f "$ltmain"; then - _LT_AC_TAGVAR(module_cmds, $1) \ - _LT_AC_TAGVAR(module_expsym_cmds, $1) \ - _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \ -+ _LT_AC_TAGVAR(fix_srcfile_path, $1) \ - _LT_AC_TAGVAR(exclude_expsyms, $1) \ - _LT_AC_TAGVAR(include_expsyms, $1); do - -@@ -4186,7 +4396,7 @@ ifelse([$1], [], - # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 - # Free Software Foundation, Inc. - # - # This file is part of GNU Libtool: -@@ -4423,6 +4633,10 @@ predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1) - # shared library. - postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) - -+# The directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) -+ - # The library search path used internally by the compiler when linking - # a shared library. - compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) -@@ -4511,7 +4725,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea - sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - - # Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)" -+fix_srcfile_path=$lt_fix_srcfile_path - - # Set to yes if exported symbols are required. - always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) -@@ -4594,6 +4808,7 @@ fi - # --------------------------------- - AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], - [AC_REQUIRE([AC_CANONICAL_HOST]) -+AC_REQUIRE([LT_AC_PROG_SED]) - AC_REQUIRE([AC_PROG_NM]) - AC_REQUIRE([AC_OBJEXT]) - # Check for command to grab the raw symbol name followed by C symbol from nm. -@@ -4771,7 +4986,7 @@ EOF - echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD - cat conftest.$ac_ext >&5 - fi -- rm -f conftest* conftst* -+ rm -rf conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then -@@ -4820,13 +5035,16 @@ AC_MSG_CHECKING([for $compiler option to - # like `-m68040'. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; -- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; -- mingw* | os2* | pw32*) -+ mingw* | cygwin* | os2* | pw32*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries -+ m4_if([$1], [GCJ], [], -+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - darwin* | rhapsody*) - # PIC is the default on this platform -@@ -4837,7 +5055,7 @@ AC_MSG_CHECKING([for $compiler option to - # DJGPP does not support shared libraries at all - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - ;; -- interix3*) -+ interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; -@@ -4863,7 +5081,7 @@ AC_MSG_CHECKING([for $compiler option to - esac - else - case $host_os in -- aix4* | aix5*) -+ aix[[4-9]]*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor -@@ -4959,7 +5177,7 @@ AC_MSG_CHECKING([for $compiler option to - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; -- pgCC*) -+ pgCC* | pgcpp*) - # Portland Group C++ compiler. - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' -@@ -4973,6 +5191,14 @@ AC_MSG_CHECKING([for $compiler option to - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' -+ ;; -+ esac - ;; - esac - ;; -@@ -5093,14 +5319,17 @@ AC_MSG_CHECKING([for $compiler option to - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - -- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - -- mingw* | pw32* | os2*) -+ mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries -+ m4_if([$1], [GCJ], [], -+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - - darwin* | rhapsody*) -@@ -5109,7 +5338,7 @@ AC_MSG_CHECKING([for $compiler option to - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - -- interix3*) -+ interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; -@@ -5167,10 +5396,11 @@ AC_MSG_CHECKING([for $compiler option to - esac - ;; - -- mingw* | pw32* | os2*) -+ mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' -+ m4_if([$1], [GCJ], [], -+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - - hpux9* | hpux10* | hpux11*) -@@ -5219,6 +5449,22 @@ AC_MSG_CHECKING([for $compiler option to - # All Alpha code is PIC. - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C 5.9 -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ ;; -+ *Sun\ F*) -+ # Sun Fortran 8.3 passes all unrecognized flags to the linker -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='' -+ ;; -+ esac -+ ;; - esac - ;; - -@@ -5228,6 +5474,10 @@ AC_MSG_CHECKING([for $compiler option to - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - -+ rdos*) -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; -+ - solaris*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -@@ -5287,7 +5537,7 @@ AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_co - # - if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then - AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], -- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), -+ _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), - [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], - [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in - "" | " "*) ;; -@@ -5311,7 +5561,7 @@ esac - # - wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" - AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], -- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), -+ _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), - $lt_tmp_static_flag, - [], - [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) -@@ -5322,11 +5572,12 @@ AC_LIBTOOL_LINKER_OPTION([if $compiler s - # ------------------------------------ - # See if the linker supports building shared libraries. - AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], --[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) - ifelse([$1],[CXX],[ - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - case $host_os in -- aix4* | aix5*) -+ aix[[4-9]]*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -@@ -5339,7 +5590,7 @@ ifelse([$1],[CXX],[ - _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" - ;; - cygwin* | mingw*) -- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' - ;; - linux* | k*bsd*-gnu) - _LT_AC_TAGVAR(link_all_deplibs, $1)=no -@@ -5348,6 +5599,7 @@ ifelse([$1],[CXX],[ - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac -+ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - ],[ - runpath_var= - _LT_AC_TAGVAR(allow_undefined_flag, $1)= -@@ -5378,12 +5630,14 @@ ifelse([$1],[CXX],[ - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. -- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" -+ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. -+ # Exclude shared library initialization/finalization symbols. -+dnl Note also adjust exclude_expsyms for C++ above. - extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - _LT_CC_BASENAME([$compiler]) -@@ -5433,7 +5687,7 @@ ifelse([$1],[CXX],[ - - # See if GNU ld supports shared libraries. - case $host_os in -- aix3* | aix4* | aix5*) -+ aix[[3-9]]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - _LT_AC_TAGVAR(ld_shlibs, $1)=no -@@ -5481,7 +5735,7 @@ EOF - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(always_export_symbols, $1)=no - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -5499,7 +5753,7 @@ EOF - fi - ;; - -- interix3*) -+ interix[[3-9]]*) - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -@@ -5514,7 +5768,7 @@ EOF - _LT_AC_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' - ;; - -- linux* | k*bsd*-gnu) -+ gnu* | linux* | k*bsd*-gnu) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_addflag= - case $cc_basename,$host_cpu in -@@ -5532,13 +5786,22 @@ EOF - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - esac -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) # Sun C 5.9 -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_sharedflag='-G' ;; -+ *Sun\ F*) # Sun Fortran 8.3 -+ tmp_sharedflag='-G' ;; -+ *) -+ tmp_sharedflag='-shared' ;; -+ esac -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test $supports_anon_versioning = yes; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - $echo "local: *; };" >> $output_objdir/$libname.ver~ -- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - _LT_AC_TAGVAR(link_all_deplibs, $1)=no - else -@@ -5579,7 +5842,7 @@ EOF - - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in -- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) -+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -@@ -5644,7 +5907,7 @@ _LT_EOF - fi - ;; - -- aix4* | aix5*) -+ aix[[4-9]]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. -@@ -5664,7 +5927,7 @@ _LT_EOF - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. -- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) -+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes -@@ -5698,7 +5961,7 @@ _LT_EOF - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ : - else - # We have old collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported -@@ -5791,7 +6054,7 @@ _LT_EOF - # The linker will automatically build a .lib file if we build a DLL. - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' - # FIXME: Should let the user specify the lib program. -- _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' - _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; -@@ -5824,19 +6087,18 @@ _LT_EOF - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) -@@ -5998,24 +6260,28 @@ _LT_EOF - ;; - - openbsd*) -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ if test -f /usr/libexec/ld.so; then -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ else -+ case $host_os in -+ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ ;; -+ esac -+ fi - else -- case $host_os in -- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -- ;; -- *) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- ;; -- esac -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - -@@ -6074,17 +6340,16 @@ _LT_EOF - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) -- # The compiler driver will combine linker options so we -- # cannot just pass the convience library names through -- # without $wl, iff we do not link with $LD. -- # Luckily, gcc supports the same syntax we need for Sun Studio. -+ # 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?) -- case $wlarc in -- '') -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; -- *) -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; -- esac ;; -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ else -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' -+ fi -+ ;; - esac - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - ;; -@@ -6141,7 +6406,7 @@ _LT_EOF - fi - ;; - -- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) -+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -@@ -6216,7 +6481,7 @@ x|xyes) - # to ld, don't add -lc before -lgcc. - AC_MSG_CHECKING([whether -lc should be explicitly linked in]) - $rm conftest* -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then - soname=conftest -@@ -6319,6 +6584,30 @@ AC_DEFUN([LT_AC_PROG_RC], - [AC_CHECK_TOOL(RC, windres, no) - ]) - -+ -+# Cheap backport of AS_EXECUTABLE_P and required macros -+# from Autoconf 2.59; we should not use $as_executable_p directly. -+ -+# _AS_TEST_PREPARE -+# ---------------- -+m4_ifndef([_AS_TEST_PREPARE], -+[m4_defun([_AS_TEST_PREPARE], -+[if test -x / >/dev/null 2>&1; then -+ as_executable_p='test -x' -+else -+ as_executable_p='test -f' -+fi -+])])# _AS_TEST_PREPARE -+ -+# AS_EXECUTABLE_P -+# --------------- -+# Check whether a file is executable. -+m4_ifndef([AS_EXECUTABLE_P], -+[m4_defun([AS_EXECUTABLE_P], -+[AS_REQUIRE([_AS_TEST_PREPARE])dnl -+$as_executable_p $1[]dnl -+])])# AS_EXECUTABLE_P -+ - # NOTE: This macro has been submitted for inclusion into # - # GNU Autoconf as AC_PROG_SED. When it is available in # - # a released version of Autoconf we should remove this # -@@ -6339,12 +6628,13 @@ do - test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then -+ if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi - done - done - done -+IFS=$as_save_IFS - lt_ac_max=0 - lt_ac_count=0 - # Add /usr/xpg4/bin/sed as it is typically found on Solaris -@@ -6377,10 +6667,11 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xp - done - ]) - SED=$lt_cv_path_SED -+AC_SUBST([SED]) - AC_MSG_RESULT([$SED]) - ]) - --# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. -+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -6390,14 +6681,31 @@ AC_MSG_RESULT([$SED]) - # ---------------------------- - # Automake X.Y traces this macro to ensure aclocal.m4 has been - # generated from the m4 files accompanying Automake X.Y. --AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) -+# (This private macro should not be called outside this file.) -+AC_DEFUN([AM_AUTOMAKE_VERSION], -+[am__api_version='1.10' -+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], [], -+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -+]) -+ -+# _AM_AUTOCONF_VERSION(VERSION) -+# ----------------------------- -+# aclocal traces this macro to find the Autoconf version. -+# This is a private macro too. Using m4_define simplifies -+# the logic in aclocal, which can simply ignore this definition. -+m4_define([_AM_AUTOCONF_VERSION], []) - - # AM_SET_CURRENT_AUTOMAKE_VERSION - # ------------------------------- --# Call AM_AUTOMAKE_VERSION so it can be traced. -+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. - # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. - AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -- [AM_AUTOMAKE_VERSION([1.9.6])]) -+[AM_AUTOMAKE_VERSION([1.10.1])dnl -+m4_ifndef([AC_AUTOCONF_VERSION], -+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) - - # AM_AUX_DIR_EXPAND -*- Autoconf -*- - -@@ -6454,14 +6762,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd` - - # AM_CONDITIONAL -*- Autoconf -*- - --# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 -+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 - # 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 7 -+# serial 8 - - # AM_CONDITIONAL(NAME, SHELL-CONDITION) - # ------------------------------------- -@@ -6470,8 +6778,10 @@ AC_DEFUN([AM_CONDITIONAL], - [AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl --AC_SUBST([$1_TRUE]) --AC_SUBST([$1_FALSE]) -+AC_SUBST([$1_TRUE])dnl -+AC_SUBST([$1_FALSE])dnl -+_AM_SUBST_NOTMAKE([$1_TRUE])dnl -+_AM_SUBST_NOTMAKE([$1_FALSE])dnl - if $2; then - $1_TRUE= - $1_FALSE='#' -@@ -6485,15 +6795,14 @@ AC_CONFIG_COMMANDS_PRE( - Usually this means the macro was only invoked conditionally.]]) - fi])]) - -- --# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 -+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - # 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 - - # 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, -@@ -6521,6 +6830,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl - ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], -+ [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) - -@@ -6586,6 +6896,7 @@ AC_CACHE_CHECK([dependency style of $dep - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} 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 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -@@ -6638,7 +6949,8 @@ if test "x$enable_dependency_tracking" ! - AMDEPBACKSLASH='\' - fi - AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) --AC_SUBST([AMDEPBACKSLASH]) -+AC_SUBST([AMDEPBACKSLASH])dnl -+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl - ]) - - # Generate code to set up dependency tracking. -*- Autoconf -*- -@@ -6663,8 +6975,9 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS - # 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. -- # So let's grep whole file. -- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then -+ # 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 -@@ -6723,14 +7036,14 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_ - - # Do all the work for Automake. -*- Autoconf -*- - --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 --# Free Software Foundation, Inc. -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 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 12 -+# serial 13 - - # 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. -@@ -6747,16 +7060,20 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_ - # 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.58])dnl -+[AC_PREREQ([2.60])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 - AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl - AC_REQUIRE([AC_PROG_INSTALL])dnl --# test to see if srcdir already configured --if test "`cd $srcdir && pwd`" != "`pwd`" && -- test -f $srcdir/config.status; then -- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -+if test "`cd $srcdir && pwd`" != "`pwd`"; then -+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output -+ # is not polluted with repeated "-I." -+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl -+ # test to see if srcdir already configured -+ if test -f $srcdir/config.status; then -+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -+ fi - fi - - # test whether we have cygpath -@@ -6776,6 +7093,9 @@ m4_ifval([$2], - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], - [_AM_SET_OPTIONS([$1])dnl -+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, -+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - -@@ -6811,6 +7131,10 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_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 - ]) - ]) - -@@ -6824,16 +7148,17 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX], - # our stamp files there. - AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], - [# Compute $1's index in $config_headers. -+_am_arg=$1 - _am_stamp_count=1 - for _am_header in $config_headers :; do - case $_am_header in -- $1 | $1:* ) -+ $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac - done --echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) -+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) - - # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. - # -@@ -6846,7 +7171,7 @@ echo "timestamp for $1" >`AS_DIRNAME([$1 - # Define $install_sh. - AC_DEFUN([AM_PROG_INSTALL_SH], - [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl --install_sh=${install_sh-"$am_aux_dir/install-sh"} -+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} - AC_SUBST(install_sh)]) - - # Copyright (C) 2003, 2005 Free Software Foundation, Inc. -@@ -6951,13 +7276,14 @@ AC_MSG_RESULT([$_am_result]) - rm -f confinc confmf - ]) - --# Copyright (C) 1999, 2000, 2001, 2003, 2005 Free Software Foundation, Inc. -+# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005 -+# 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_PROG_CC_C_O - # -------------- -@@ -6965,6 +7291,7 @@ rm -f confinc confmf - AC_DEFUN([AM_PROG_CC_C_O], - [AC_REQUIRE([AC_PROG_CC_C_O])dnl - AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -+AC_REQUIRE_AUX_FILE([compile])dnl - # FIXME: we rely on the cache variable name because - # there is no other way. - set dummy $CC -@@ -6977,18 +7304,22 @@ if eval "test \"`echo '$ac_cv_prog_cc_'$ - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" - fi -+dnl Make sure AC_PROG_CC is never called again, or it will override our -+dnl setting of CC. -+m4_define([AC_PROG_CC], -+ [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) - ]) - - # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- - --# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 -+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 - # 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_MISSING_PROG(NAME, PROGRAM) - # ------------------------------ -@@ -7004,6 +7335,7 @@ AC_SUBST($1)]) - # If it does, set am_missing_run to use it, otherwise, to nothing. - 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" - # Use eval to expand $SHELL - if eval "$MISSING --run true"; then -@@ -7014,7 +7346,7 @@ else - fi - ]) - --# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. -+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -7022,60 +7354,23 @@ fi - - # AM_PROG_MKDIR_P - # --------------- --# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. --# --# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories --# created by `make install' are always world readable, even if the --# installer happens to have an overly restrictive umask (e.g. 077). --# This was a mistake. There are at least two reasons why we must not --# use `-m 0755': --# - it causes special bits like SGID to be ignored, --# - it may be too restrictive (some setups expect 775 directories). --# --# Do not use -m 0755 and let people choose whatever they expect by --# setting umask. --# --# We cannot accept any implementation of `mkdir' that recognizes `-p'. --# Some implementations (such as Solaris 8's) are not thread-safe: if a --# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' --# concurrently, both version can detect that a/ is missing, but only --# one can create it and the other will error out. Consequently we --# restrict ourselves to GNU make (using the --version option ensures --# this.) -+# Check for `mkdir -p'. - AC_DEFUN([AM_PROG_MKDIR_P], --[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then -- # We used to keeping the `.' as first argument, in order to -- # allow $(mkdir_p) to be used without argument. As in -- # $(mkdir_p) $(somedir) -- # where $(somedir) is conditionally defined. However this is wrong -- # for two reasons: -- # 1. if the package is installed by a user who cannot write `.' -- # make install will fail, -- # 2. the above comment should most certainly read -- # $(mkdir_p) $(DESTDIR)$(somedir) -- # so it does not work when $(somedir) is undefined and -- # $(DESTDIR) is not. -- # To support the latter case, we have to write -- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), -- # so the `.' trick is pointless. -- mkdir_p='mkdir -p --' --else -- # On NextStep and OpenStep, the `mkdir' command does not -- # recognize any option. It will interpret all options as -- # directories to create, and then abort because `.' already -- # exists. -- for d in ./-p ./--version; -- do -- test -d $d && rmdir $d -- done -- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. -- if test -f "$ac_aux_dir/mkinstalldirs"; then -- mkdir_p='$(mkinstalldirs)' -- else -- mkdir_p='$(install_sh) -d' -- fi --fi --AC_SUBST([mkdir_p])]) -+[AC_PREREQ([2.60])dnl -+AC_REQUIRE([AC_PROG_MKDIR_P])dnl -+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -+dnl while keeping a definition of mkdir_p for backward compatibility. -+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -+dnl Makefile.ins that do not define MKDIR_P, so we do our own -+dnl adjustment using top_builddir (which is defined more often than -+dnl MKDIR_P). -+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -+case $mkdir_p in -+ [[\\/$]]* | ?:[[\\/]]*) ;; -+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -+esac -+]) - - # Helper functions for option handling. -*- Autoconf -*- - -@@ -7187,9 +7482,21 @@ dnl Don't test for $cross_compiling = ye - if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) - fi --INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" -+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - AC_SUBST([INSTALL_STRIP_PROGRAM])]) - -+# Copyright (C) 2006 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. -+ -+# _AM_SUBST_NOTMAKE(VARIABLE) -+# --------------------------- -+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. -+# This macro is traced by Automake. -+AC_DEFUN([_AM_SUBST_NOTMAKE]) -+ - # Check how to create a tarball. -*- Autoconf -*- - - # Copyright (C) 2004, 2005 Free Software Foundation, Inc. -@@ -7287,7 +7594,4 @@ AC_SUBST([am__untar]) - ]) # _AM_PROG_TAR - - m4_include([m4/as-ac-expand.m4]) --m4_include([m4/ogg.m4]) - m4_include([m4/pkg.m4]) --m4_include([m4/sdl.m4]) --m4_include([m4/vorbis.m4]) -Index: libtheora-1.0/config.h.in -=================================================================== ---- libtheora-1.0.orig/config.h.in -+++ libtheora-1.0/config.h.in -@@ -12,6 +12,12 @@ - /* Define to 1 if you have the <memory.h> header file. */ - #undef HAVE_MEMORY_H - -+/* ogg */ -+#undef HAVE_OGG -+ -+/* sdl */ -+#undef HAVE_SDL -+ - /* Define to 1 if you have the <soundcard.h> header file. */ - #undef HAVE_SOUNDCARD_H - -@@ -39,6 +45,9 @@ - /* Define to 1 if you have the <unistd.h> header file. */ - #undef HAVE_UNISTD_H - -+/* vorbis */ -+#undef HAVE_VORBIS -+ - /* Define to 1 if your C compiler doesn't accept -c and -o together. */ - #undef NO_MINUS_C_MINUS_O - -Index: libtheora-1.0/configure -=================================================================== ---- libtheora-1.0.orig/configure -+++ libtheora-1.0/configure -@@ -1,6 +1,6 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.60a for libtheora 1.0. -+# Generated by GNU Autoconf 2.61 for libtheora 1.0. - # - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, - # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -@@ -10,7 +10,8 @@ - ## M4sh Initialization. ## - ## --------------------- ## - --# Be Bourne compatible -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -@@ -19,10 +20,13 @@ if test -n "${ZSH_VERSION+set}" && (emul - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST - else -- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ - fi --BIN_SH=xpg4; export BIN_SH # for Tru64 --DUALCASE=1; export DUALCASE # for MKS sh -+ -+ - - - # PATH needs CR -@@ -215,7 +219,7 @@ test \$exitcode = 0) || { (exit 1); exit - else - as_candidate_shells= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -@@ -233,7 +237,6 @@ IFS=$as_save_IFS - # 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 --# Be Bourne compatible - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -@@ -242,10 +245,12 @@ if test -n "${ZSH_VERSION+set}" && (emul - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST - else -- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ - fi --BIN_SH=xpg4; export BIN_SH # for Tru64 --DUALCASE=1; export DUALCASE # for MKS sh -+ - - : - _ASEOF -@@ -253,7 +258,6 @@ _ASEOF - CONFIG_SHELL=$as_shell - as_have_required=yes - if { "$as_shell" 2> /dev/null <<\_ASEOF --# Be Bourne compatible - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -@@ -262,10 +266,12 @@ if test -n "${ZSH_VERSION+set}" && (emul - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST - else -- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ - fi --BIN_SH=xpg4; export BIN_SH # for Tru64 --DUALCASE=1; export DUALCASE # for MKS sh -+ - - : - (as_func_return () { -@@ -512,19 +518,28 @@ else - as_mkdir_p=false - fi - --# Find out whether ``test -x'' works. Don't use a zero-byte file, as --# systems may use methods other than mode bits to determine executability. --cat >conf$$.file <<_ASEOF --#! /bin/sh --exit 0 --_ASEOF --chmod +x conf$$.file --if test -x conf$$.file >/dev/null 2>&1; then -- as_executable_p="test -x" -+if test -x / >/dev/null 2>&1; then -+ as_test_x='test -x' - else -- as_executable_p=: -+ 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 --rm -f conf$$.file -+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'" -@@ -804,6 +819,7 @@ target_os - INSTALL_PROGRAM - INSTALL_SCRIPT - INSTALL_DATA -+am__isrc - CYGPATH_W - PACKAGE - VERSION -@@ -851,12 +867,15 @@ CCDEPMODE - am__fastdepCC_TRUE - am__fastdepCC_FALSE - CPP -+SED - GREP - EGREP - LN_S - ECHO - AR - RANLIB -+DSYMUTIL -+NMEDIT - DLLTOOL - AS - OBJDUMP -@@ -891,15 +910,20 @@ OC_X86ASM_FALSE - THEORADEC_LDFLAGS - THEORAENC_LDFLAGS - THEORA_LDFLAGS --HAVE_PKG_CONFIG -+HAVE_OGG_TRUE -+HAVE_OGG_FALSE -+REQUIRES_OGG - PKG_CONFIG - OGG_CFLAGS - OGG_LIBS -+HAVE_VORBIS_TRUE -+HAVE_VORBIS_FALSE -+REQUIRES_VORBIS - VORBIS_CFLAGS - VORBIS_LIBS --VORBISENC_LIBS --VORBISFILE_LIBS --SDL_CONFIG -+HAVE_SDL_TRUE -+HAVE_SDL_FALSE -+REQUIRES_SDL - SDL_CFLAGS - SDL_LIBS - PNG_CFLAGS -@@ -927,6 +951,7 @@ target_alias - CC - CFLAGS - LDFLAGS -+LIBS - CPPFLAGS - CPP - CXX -@@ -1040,10 +1065,10 @@ do - -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -+ 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'` -+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=no ;; - - -docdir | --docdir | --docdi | --doc | --do) -@@ -1059,10 +1084,10 @@ do - -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -+ 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'` -+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ -@@ -1256,19 +1281,19 @@ do - -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -+ 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'` -+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=\$ac_optarg ;; - - -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -+ 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'` -+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=no ;; - - --x) -@@ -1526,9 +1551,9 @@ Optional Features: - --disable-libtool-lock avoid locking (might break parallel builds) - --enable-valgrind-testing enable running of tests inside Valgrind - --disable-asm disable assembly optimizations -- --disable-oggtest Do not try to compile and run a test Ogg program -- --disable-vorbistest Do not try to compile and run a test Vorbis program -- --disable-sdltest Do not try to compile and run a test SDL program -+ --enable-ogg enable ogg [default=yes] -+ --enable-vorbis enable vorbis [default=yes] -+ --enable-sdl enable SDL [default=yes] - --disable-float disable use of floating point code - --disable-encode disable encoding support - --disable-examples disable examples -@@ -1540,23 +1565,13 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-tags[=TAGS] include additional configurations [automatic] -- --with-ogg=PFX Prefix where libogg is installed (optional) -- --with-ogg-libraries=DIR -- Directory where libogg library is installed -- (optional) -- --with-ogg-includes=DIR Directory where libogg header files are installed -- (optional) -- --with-vorbis=PFX Prefix where libvorbis is installed (optional) -- --with-vorbis-libraries=DIR Directory where libvorbis library is installed (optional) -- --with-vorbis-includes=DIR Directory where libvorbis header files are installed (optional) -- --with-sdl-prefix=PFX Prefix where SDL is installed (optional) -- --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional) - - Some influential environment variables: - CC C compiler command - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a - nonstandard directory <lib dir> -+ LIBS libraries to pass to the linker, e.g. -l<library> - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if - you have headers in a nonstandard directory <include dir> - CPP C preprocessor -@@ -1630,7 +1645,7 @@ test -n "$ac_init_help" && exit $ac_stat - if $ac_init_version; then - cat <<\_ACEOF - libtheora configure 1.0 --generated by GNU Autoconf 2.60a -+generated by GNU Autoconf 2.61 - - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, - 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -@@ -1644,7 +1659,7 @@ This file contains any messages produced - running configure, to aid debugging if configure makes a mistake. - - It was created by libtheora $as_me 1.0, which was --generated by GNU Autoconf 2.60a. Invocation command line was -+generated by GNU Autoconf 2.61. Invocation command line was - - $ $0 $@ - -@@ -2158,7 +2173,8 @@ test -n "$target_alias" && - ac_config_headers="$ac_config_headers config.h" - - --am__api_version="1.9" -+am__api_version='1.10' -+ - # 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: -@@ -2195,7 +2211,7 @@ case $as_dir/ in - # 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_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then -+ 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. -@@ -2310,38 +2326,53 @@ else - echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} - fi - --if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then -- # We used to keeping the `.' as first argument, in order to -- # allow $(mkdir_p) to be used without argument. As in -- # $(mkdir_p) $(somedir) -- # where $(somedir) is conditionally defined. However this is wrong -- # for two reasons: -- # 1. if the package is installed by a user who cannot write `.' -- # make install will fail, -- # 2. the above comment should most certainly read -- # $(mkdir_p) $(DESTDIR)$(somedir) -- # so it does not work when $(somedir) is undefined and -- # $(DESTDIR) is not. -- # To support the latter case, we have to write -- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), -- # so the `.' trick is pointless. -- mkdir_p='mkdir -p --' --else -- # On NextStep and OpenStep, the `mkdir' command does not -- # recognize any option. It will interpret all options as -- # directories to create, and then abort because `.' already -- # exists. -- for d in ./-p ./--version; -- do -- test -d $d && rmdir $d -- done -- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. -- if test -f "$ac_aux_dir/mkinstalldirs"; then -- mkdir_p='$(mkinstalldirs)' -+{ 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 -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in mkdir gmkdir; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue -+ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( -+ 'mkdir (GNU coreutils) '* | \ -+ 'mkdir (coreutils) '* | \ -+ 'mkdir (fileutils) '4.1*) -+ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext -+ break 3;; -+ esac -+ done -+ done -+done -+IFS=$as_save_IFS -+ -+fi -+ -+ if test "${ac_cv_path_mkdir+set}" = set; then -+ MKDIR_P="$ac_cv_path_mkdir -p" - else -- mkdir_p='$(install_sh) -d' -+ # As a last resort, use the slow shell script. Don't cache a -+ # 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; } -+ -+mkdir_p="$MKDIR_P" -+case $mkdir_p in -+ [\\/$]* | ?:[\\/]*) ;; -+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -+esac - - for ac_prog in gawk mawk nawk awk - do -@@ -2361,7 +2392,7 @@ 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -+ 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 - break 2 -@@ -2424,12 +2455,16 @@ else - fi - rmdir .tst 2>/dev/null - --# test to see if srcdir already configured --if test "`cd $srcdir && pwd`" != "`pwd`" && -- test -f $srcdir/config.status; then -- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -+if test "`cd $srcdir && pwd`" != "`pwd`"; then -+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output -+ # is not polluted with repeated "-I." -+ 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; }; } -+ fi - fi - - # test whether we have cygpath -@@ -2472,7 +2507,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru - - MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - --install_sh=${install_sh-"$am_aux_dir/install-sh"} -+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 -@@ -2496,7 +2531,7 @@ 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -+ 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 -@@ -2536,7 +2571,7 @@ 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -+ 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 -@@ -2576,7 +2611,7 @@ else - fi - - fi --INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" -+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - - # We need awk for the "check" target. The system "awk" is bad on - # some platforms. -@@ -2601,9 +2636,7 @@ fi - - { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 - echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } -- -- --if test $USE_MAINTAINER_MODE = yes; then -+ if test $USE_MAINTAINER_MODE = yes; then - MAINTAINER_MODE_TRUE= - MAINTAINER_MODE_FALSE='#' - else -@@ -2663,7 +2696,7 @@ 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -+ 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 - break 2 -@@ -2703,7 +2736,7 @@ 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -+ 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 - break 2 -@@ -2760,7 +2793,7 @@ 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -+ 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 - break 2 -@@ -2801,7 +2834,7 @@ 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -+ 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 -@@ -2859,7 +2892,7 @@ 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -+ 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 - break 2 -@@ -2903,7 +2936,7 @@ 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -+ 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 - break 2 -@@ -3266,27 +3299,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes - else - echo "$as_me: failed program was:" >&5 -@@ -3341,27 +3357,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_g=yes - else - echo "$as_me: failed program was:" >&5 -@@ -3396,27 +3395,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (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 -@@ -3452,27 +3434,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_g=yes - else - echo "$as_me: failed program was:" >&5 -@@ -3588,27 +3553,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_c89=$ac_arg - else - echo "$as_me: failed program was:" >&5 -@@ -3697,9 +3645,7 @@ if test "x$enable_dependency_tracking" ! - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' - fi -- -- --if test "x$enable_dependency_tracking" != xno; then -+ if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' - else -@@ -3709,7 +3655,6 @@ fi - - - -- - depcc="$CC" am_compiler_list= - - { echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -@@ -3777,6 +3722,7 @@ else - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} 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 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -@@ -3806,9 +3752,7 @@ fi - echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } - CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - -- -- --if -+ if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= -@@ -3871,17 +3815,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (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 -@@ -3915,17 +3852,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - # Broken: success on invalid input. - continue - else -@@ -3990,17 +3920,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (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 -@@ -4034,17 +3957,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - # Broken: success on invalid input. - continue - else -@@ -4206,6 +4122,7 @@ fi - - - -+ - # Check whether --enable-shared was given. - if test "${enable_shared+set}" = set; then - enableval=$enable_shared; p=${PACKAGE-default} -@@ -4292,12 +4209,13 @@ do - test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then -+ if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi - done - done - done -+IFS=$as_save_IFS - lt_ac_max=0 - lt_ac_count=0 - # Add /usr/xpg4/bin/sed as it is typically found on Solaris -@@ -4332,6 +4250,7 @@ done - fi - - SED=$lt_cv_path_SED -+ - { echo "$as_me:$LINENO: result: $SED" >&5 - echo "${ECHO_T}$SED" >&6; } - -@@ -4356,7 +4275,7 @@ do - 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_executable_p "$ac_path_GREP"; } || continue -+ { 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 -@@ -4438,7 +4357,7 @@ do - 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_executable_p "$ac_path_EGREP"; } || continue -+ { 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 -@@ -4693,8 +4612,8 @@ else - echo "${ECHO_T}no, using $LN_S" >&6; } - fi - --{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 --echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; } -+{ 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 - else -@@ -4713,7 +4632,7 @@ lt_cv_deplibs_check_method='unknown' - # whether `pass_all' will *always* work, you probably want this one. - - case $host_os in --aix4* | aix5*) -+aix[4-9]*) - lt_cv_deplibs_check_method=pass_all - ;; - -@@ -4735,9 +4654,15 @@ cygwin*) - - mingw* | pw32*) - # Base MSYS/MinGW do not provide the 'file' command needed by -- # func_win32_libid shell function, so use a weaker test based on 'objdump'. -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -- lt_cv_file_magic_cmd='$OBJDUMP -f' -+ # func_win32_libid shell function, so use a weaker test based on 'objdump', -+ # unless we find 'file', for example because we are cross-compiling. -+ if ( file / ) >/dev/null 2>&1; then -+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' -+ lt_cv_file_magic_cmd='func_win32_libid' -+ else -+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ lt_cv_file_magic_cmd='$OBJDUMP -f' -+ fi - ;; - - darwin* | rhapsody*) -@@ -4782,7 +4707,7 @@ hpux10.20* | hpux11*) - esac - ;; - --interix3*) -+interix[3-9]*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' - ;; -@@ -4832,6 +4757,10 @@ osf3* | osf4* | osf5*) - lt_cv_deplibs_check_method=pass_all - ;; - -+rdos*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ - solaris*) - lt_cv_deplibs_check_method=pass_all - ;; -@@ -4919,7 +4848,7 @@ ia64-*-hpux*) - ;; - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 4922 "configure"' > conftest.$ac_ext -+ echo '#line 4851 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -@@ -4954,7 +4883,8 @@ ia64-*-hpux*) - rm -rf conftest* - ;; - --x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) -+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -+s390*-*linux*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -@@ -4965,6 +4895,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li - case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in -+ x86_64-*kfreebsd*-gnu) -+ LD="${LD-ld} -m elf_i386_fbsd" -+ ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; -@@ -4981,6 +4914,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li - ;; - *64-bit*) - case $host in -+ x86_64-*kfreebsd*-gnu) -+ LD="${LD-ld} -m elf_x86_64_fbsd" -+ ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; -@@ -5043,27 +4979,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - lt_cv_cc_needs_belf=yes - else - echo "$as_me: failed program was:" >&5 -@@ -5100,7 +5020,11 @@ sparc*-*solaris*) - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; -- *) LD="${LD-ld} -64" ;; -+ *) -+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then -+ LD="${LD-ld} -64" -+ fi -+ ;; - esac - ;; - esac -@@ -5126,7 +5050,7 @@ 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -5166,7 +5090,7 @@ 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -+ 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_DLLTOOL="dlltool" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -5222,7 +5146,7 @@ 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AS="${ac_tool_prefix}as" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -5262,7 +5186,7 @@ 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -+ 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_AS="as" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -5318,7 +5242,7 @@ 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -+ 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -5358,7 +5282,7 @@ 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -+ 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" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -5442,27 +5366,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (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 -@@ -5638,27 +5545,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (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 -@@ -5721,27 +5611,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (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 -@@ -5777,17 +5650,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (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 -@@ -5874,7 +5740,7 @@ 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -5918,7 +5784,7 @@ 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -+ 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_CXX="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -6031,27 +5897,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes - else - echo "$as_me: failed program was:" >&5 -@@ -6106,27 +5955,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes - else - echo "$as_me: failed program was:" >&5 -@@ -6161,27 +5993,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - : - else - echo "$as_me: failed program was:" >&5 -@@ -6217,27 +6032,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes - else - echo "$as_me: failed program was:" >&5 -@@ -6345,6 +6143,7 @@ else - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} 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 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -@@ -6374,9 +6173,7 @@ fi - echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } - CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - -- -- --if -+ if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= -@@ -6440,17 +6237,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_cxx_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ }; then - : - else - echo "$as_me: failed program was:" >&5 -@@ -6484,17 +6274,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_cxx_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ }; then - # Broken: success on invalid input. - continue - else -@@ -6559,17 +6342,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_cxx_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ }; then - : - else - echo "$as_me: failed program was:" >&5 -@@ -6603,17 +6379,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_cxx_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ }; then - # Broken: success on invalid input. - continue - else -@@ -6654,7 +6423,7 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac - ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_f77_compiler_gnu - if test -n "$ac_tool_prefix"; then -- for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn -+ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn - 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 -@@ -6672,7 +6441,7 @@ 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_F77="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -6698,7 +6467,7 @@ fi - fi - if test -z "$F77"; then - ac_ct_F77=$F77 -- for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn -+ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 -@@ -6716,7 +6485,7 @@ 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -+ 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_F77="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -6823,27 +6592,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_f77_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes - else - echo "$as_me: failed program was:" >&5 -@@ -6886,27 +6638,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_f77_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_prog_f77_g=yes - else - echo "$as_me: failed program was:" >&5 -@@ -6946,7 +6681,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! -- - # find the maximum length of command line arguments - { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 - echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } -@@ -7033,24 +6767,27 @@ else - fi - ;; - *) -- # If test is not a shell built-in, we'll probably end up computing a -- # maximum length that is only half of the actual maximum length, but -- # we can't tell. -- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} -- while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ -+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` -+ if test -n "$lt_cv_sys_max_cmd_len"; then -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` -+ else -+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} -+ while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ - = "XX$teststring") >/dev/null 2>&1 && -- new_result=`expr "X$teststring" : ".*" 2>&1` && -- lt_cv_sys_max_cmd_len=$new_result && -- test $i != 17 # 1/2 MB should be enough -- do -- i=`expr $i + 1` -- teststring=$teststring$teststring -- done -- teststring= -- # Add a significant safety factor because C++ compilers can tack on massive -- # amounts of additional arguments before passing them to the linker. -- # It appears as though 1/2 is a usable value. -- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` -+ new_result=`expr "X$teststring" : ".*" 2>&1` && -+ lt_cv_sys_max_cmd_len=$new_result && -+ test $i != 17 # 1/2 MB should be enough -+ do -+ i=`expr $i + 1` -+ teststring=$teststring$teststring -+ done -+ teststring= -+ # Add a significant safety factor because C++ compilers can tack on massive -+ # amounts of additional arguments before passing them to the linker. -+ # It appears as though 1/2 is a usable value. -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` -+ fi - ;; - esac - -@@ -7067,6 +6804,7 @@ fi - - - -+ - # 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; } -@@ -7257,7 +6995,7 @@ EOF - echo "$progname: failed program was:" >&5 - cat conftest.$ac_ext >&5 - fi -- rm -f conftest* conftst* -+ rm -rf conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then -@@ -7361,7 +7099,7 @@ 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -+ 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 - break 2 -@@ -7401,7 +7139,7 @@ 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -+ 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 - break 2 -@@ -7457,7 +7195,7 @@ 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -+ 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 - break 2 -@@ -7497,7 +7235,7 @@ 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -+ 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 - break 2 -@@ -7553,7 +7291,7 @@ 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -+ 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 -@@ -7593,7 +7331,7 @@ 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -+ 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 -@@ -7655,7 +7393,7 @@ test -z "$STRIP" && STRIP=: - test -z "$ac_objext" && ac_objext=o - - # Determine commands to create old-style static archives. --old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' -+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' - old_postinstall_cmds='chmod 644 $oldlib' - old_postuninstall_cmds= - -@@ -7817,48 +7555,360 @@ fi - ;; - esac - --enable_dlopen=no --enable_win32_dll=yes - --# Check whether --enable-libtool-lock was given. --if test "${enable_libtool_lock+set}" = set; then -- enableval=$enable_libtool_lock; -+ case $host_os in -+ rhapsody* | darwin*) -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$DSYMUTIL"; then -+ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+DSYMUTIL=$ac_cv_prog_DSYMUTIL -+if test -n "$DSYMUTIL"; then -+ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 -+echo "${ECHO_T}$DSYMUTIL" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - --test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -+fi -+if test -z "$ac_cv_prog_DSYMUTIL"; then -+ ac_ct_DSYMUTIL=$DSYMUTIL -+ # Extract the first word of "dsymutil", so it can be a program name with args. -+set dummy dsymutil; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_DSYMUTIL"; then -+ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS - --# Check whether --with-pic was given. --if test "${with_pic+set}" = set; then -- withval=$with_pic; pic_mode="$withval" -+fi -+fi -+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL -+if test -n "$ac_ct_DSYMUTIL"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 -+echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; } - else -- pic_mode=default -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - --test -z "$pic_mode" && pic_mode=default -- --# Use C for the default configuration in the libtool script --tagname= --lt_save_CC="$CC" --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ if test "x$ac_ct_DSYMUTIL" = x; then -+ DSYMUTIL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ DSYMUTIL=$ac_ct_DSYMUTIL -+ fi -+else -+ DSYMUTIL="$ac_cv_prog_DSYMUTIL" -+fi - -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. -+set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_NMEDIT+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$NMEDIT"; then -+ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS - --# Source file extension for C test sources. --ac_ext=c -+fi -+fi -+NMEDIT=$ac_cv_prog_NMEDIT -+if test -n "$NMEDIT"; then -+ { echo "$as_me:$LINENO: result: $NMEDIT" >&5 -+echo "${ECHO_T}$NMEDIT" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi - --# Object file extension for compiled C test sources. --objext=o --objext=$objext - --# Code to be used in simple compile tests --lt_simple_compile_test_code="int some_variable = 0;\n" -+fi -+if test -z "$ac_cv_prog_NMEDIT"; then -+ ac_ct_NMEDIT=$NMEDIT -+ # Extract the first word of "nmedit", so it can be a program name with args. -+set dummy nmedit; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_NMEDIT"; then -+ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_NMEDIT="nmedit" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS - --# Code to be used in simple link tests --lt_simple_link_test_code='int main(){return(0);}\n' -+fi -+fi -+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT -+if test -n "$ac_ct_NMEDIT"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 -+echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ if test "x$ac_ct_NMEDIT" = x; then -+ NMEDIT=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ NMEDIT=$ac_ct_NMEDIT -+ fi -+else -+ NMEDIT="$ac_cv_prog_NMEDIT" -+fi -+ -+ -+ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 -+echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } -+if test "${lt_cv_apple_cc_single_mod+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_apple_cc_single_mod=no -+ if test -z "${LT_MULTI_MODULE}"; then -+ # By default we will add the -single_module flag. You can override -+ # by either setting the environment variable LT_MULTI_MODULE -+ # non-empty at configure time, or by adding -multi_module to the -+ # link flags. -+ echo "int foo(void){return 1;}" > conftest.c -+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -+ -dynamiclib ${wl}-single_module conftest.c -+ if test -f libconftest.dylib; then -+ lt_cv_apple_cc_single_mod=yes -+ rm -rf libconftest.dylib* -+ fi -+ rm conftest.c -+ fi -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 -+echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; } -+ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 -+echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; } -+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_ld_exported_symbols_list=no -+ save_LDFLAGS=$LDFLAGS -+ echo "_main" > conftest.sym -+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ lt_cv_ld_exported_symbols_list=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ lt_cv_ld_exported_symbols_list=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+ LDFLAGS="$save_LDFLAGS" -+ -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 -+echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } -+ case $host_os in -+ rhapsody* | darwin1.[0123]) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -+ darwin1.*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ darwin*) -+ # if running on 10.5 or later, the deployment target defaults -+ # to the OS version, if on x86, and 10.4, the deployment -+ # target defaults to 10.4. Don't you love it? -+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in -+ 10.0,*86*-darwin8*|10.0,*-darwin[91]*) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ 10.[012]*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ 10.*) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ esac -+ ;; -+ esac -+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then -+ _lt_dar_single_mod='$single_module' -+ fi -+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then -+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' -+ else -+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" -+ fi -+ if test "$DSYMUTIL" != ":"; then -+ _lt_dsymutil="~$DSYMUTIL \$lib || :" -+ else -+ _lt_dsymutil= -+ fi -+ ;; -+ esac -+ -+ -+enable_dlopen=no -+enable_win32_dll=yes -+ -+# Check whether --enable-libtool-lock was given. -+if test "${enable_libtool_lock+set}" = set; then -+ enableval=$enable_libtool_lock; -+fi -+ -+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -+ -+ -+# Check whether --with-pic was given. -+if test "${with_pic+set}" = set; then -+ withval=$with_pic; pic_mode="$withval" -+else -+ pic_mode=default -+fi -+ -+test -z "$pic_mode" && pic_mode=default -+ -+# Use C for the default configuration in the libtool script -+tagname= -+lt_save_CC="$CC" -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ -+# Source file extension for C test sources. -+ac_ext=c -+ -+# Object file extension for compiled C test sources. -+objext=o -+objext=$objext -+ -+# Code to be used in simple compile tests -+lt_simple_compile_test_code="int some_variable = 0;" -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code='int main(){return(0);}' - - - # If no C compiler was specified, use CC. -@@ -7873,16 +7923,16 @@ compiler=$CC - - # save warnings/boilerplate of simple test code - ac_outfile=conftest.$ac_objext --printf "$lt_simple_compile_test_code" >conftest.$ac_ext -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext - eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_compiler_boilerplate=`cat conftest.err` - $rm conftest* - - ac_outfile=conftest.$ac_objext --printf "$lt_simple_link_test_code" >conftest.$ac_ext -+echo "$lt_simple_link_test_code" >conftest.$ac_ext - eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_linker_boilerplate=`cat conftest.err` --$rm conftest* -+$rm -r conftest* - - - -@@ -7899,7 +7949,7 @@ if test "${lt_cv_prog_compiler_rtti_exce - else - lt_cv_prog_compiler_rtti_exceptions=no - ac_outfile=conftest.$ac_objext -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. -@@ -7910,11 +7960,11 @@ else - -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:7913: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:7963: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:7917: \$? = $ac_status" >&5 -+ echo "$as_me:7967: \$? = $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. -@@ -7965,13 +8015,15 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' - ;; - -- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - -- mingw* | pw32* | os2*) -+ mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries - lt_prog_compiler_pic='-DDLL_EXPORT' - ;; - -@@ -7981,7 +8033,7 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_pic='-fno-common' - ;; - -- interix3*) -+ interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; -@@ -8039,7 +8091,7 @@ echo $ECHO_N "checking for $compiler opt - esac - ;; - -- mingw* | pw32* | os2*) -+ mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic='-DDLL_EXPORT' -@@ -8091,6 +8143,22 @@ echo $ECHO_N "checking for $compiler opt - # All Alpha code is PIC. - lt_prog_compiler_static='-non_shared' - ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C 5.9 -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-Bstatic' -+ lt_prog_compiler_wl='-Wl,' -+ ;; -+ *Sun\ F*) -+ # Sun Fortran 8.3 passes all unrecognized flags to the linker -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-Bstatic' -+ lt_prog_compiler_wl='' -+ ;; -+ esac -+ ;; - esac - ;; - -@@ -8100,6 +8168,10 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_static='-non_shared' - ;; - -+ rdos*) -+ lt_prog_compiler_static='-non_shared' -+ ;; -+ - solaris*) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' -@@ -8162,12 +8234,12 @@ 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_prog_compiler_pic_works+set}" = set; then -+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_pic_works=no -+ lt_cv_prog_compiler_pic_works=no - ac_outfile=conftest.$ac_objext -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. -@@ -8178,27 +8250,27 @@ else - -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:8181: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8253: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:8185: \$? = $ac_status" >&5 -+ echo "$as_me:8257: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -- lt_prog_compiler_pic_works=yes -+ lt_cv_prog_compiler_pic_works=yes - fi - fi - $rm conftest* - - fi --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 --echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; } - --if test x"$lt_prog_compiler_pic_works" = xyes; then -+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then - case $lt_prog_compiler_pic in - "" | " "*) ;; - *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; -@@ -8225,13 +8297,13 @@ esac - wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" - { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 - echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } --if test "${lt_prog_compiler_static_works+set}" = set; then -+if test "${lt_cv_prog_compiler_static_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_static_works=no -+ lt_cv_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" -- printf "$lt_simple_link_test_code" > conftest.$ac_ext -+ echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings -@@ -8241,20 +8313,20 @@ else - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then -- lt_prog_compiler_static_works=yes -+ lt_cv_prog_compiler_static_works=yes - fi - else -- lt_prog_compiler_static_works=yes -+ lt_cv_prog_compiler_static_works=yes - fi - fi -- $rm conftest* -+ $rm -r conftest* - LDFLAGS="$save_LDFLAGS" - - fi --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 --echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } - --if test x"$lt_prog_compiler_static_works" = xyes; then -+if test x"$lt_cv_prog_compiler_static_works" = xyes; then - : - else - lt_prog_compiler_static= -@@ -8271,7 +8343,7 @@ else - mkdir conftest - cd conftest - mkdir out -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or -@@ -8282,11 +8354,11 @@ else - -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:8285: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8357: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:8289: \$? = $ac_status" >&5 -+ echo "$as_me:8361: \$? = $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 -@@ -8366,12 +8438,13 @@ echo $ECHO_N "checking whether the $comp - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. -- exclude_expsyms="_GLOBAL_OFFSET_TABLE_" -+ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. -+ # Exclude shared library initialization/finalization symbols. - extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - for cc_temp in $compiler""; do -@@ -8430,7 +8503,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed - - - # See if GNU ld supports shared libraries. - case $host_os in -- aix3* | aix4* | aix5*) -+ aix[3-9]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs=no -@@ -8478,7 +8551,7 @@ EOF - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -8496,7 +8569,7 @@ EOF - fi - ;; - -- interix3*) -+ interix[3-9]*) - hardcode_direct=no - hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -@@ -8511,7 +8584,7 @@ EOF - 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' - ;; - -- linux* | k*bsd*-gnu) -+ gnu* | linux* | k*bsd*-gnu) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_addflag= - case $cc_basename,$host_cpu in -@@ -8529,13 +8602,22 @@ EOF - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - esac -- archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) # Sun C 5.9 -+ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_sharedflag='-G' ;; -+ *Sun\ F*) # Sun Fortran 8.3 -+ tmp_sharedflag='-G' ;; -+ *) -+ tmp_sharedflag='-shared' ;; -+ esac -+ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test $supports_anon_versioning = yes; then - archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - $echo "local: *; };" >> $output_objdir/$libname.ver~ -- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - link_all_deplibs=no - else -@@ -8641,7 +8723,7 @@ _LT_EOF - fi - ;; - -- aix4* | aix5*) -+ aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. -@@ -8661,7 +8743,7 @@ _LT_EOF - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. -- case $host_os in aix4.[23]|aix4.[23].*|aix5*) -+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes -@@ -8695,7 +8777,7 @@ _LT_EOF - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 -- hardcode_direct=yes -+ : - else - # We have old collect2 - hardcode_direct=unsupported -@@ -8763,33 +8845,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -- --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'` -+ (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 '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'`; fi -+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 -@@ -8838,33 +8911,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -- --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'` -+ (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 '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'`; fi -+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 -@@ -8918,7 +8982,7 @@ if test -z "$aix_libpath"; then aix_libp - # 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' -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes=yes - ;; -@@ -8951,19 +9015,18 @@ if test -z "$aix_libpath"; then aix_libp - link_all_deplibs=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' -- archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' -- archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' -+ archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) -@@ -9125,24 +9188,28 @@ if test -z "$aix_libpath"; then aix_libp - ;; - - openbsd*) -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- 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' -+ if test -f /usr/libexec/ld.so; then -+ hardcode_direct=yes -+ hardcode_shlibpath_var=no -+ 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 -- 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 -+ ld_shlibs=no - fi - ;; - -@@ -9201,17 +9268,16 @@ if test -z "$aix_libpath"; then aix_libp - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) -- # The compiler driver will combine linker options so we -- # cannot just pass the convience library names through -- # without $wl, iff we do not link with $LD. -- # Luckily, gcc supports the same syntax we need for Sun Studio. -+ # 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?) -- case $wlarc in -- '') -- whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; -- *) -- whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; -- esac ;; -+ 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 - ;; -@@ -9268,7 +9334,7 @@ if test -z "$aix_libpath"; then aix_libp - fi - ;; - -- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) -+ 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 -@@ -9345,7 +9411,7 @@ x|xyes) - { 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* -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 -@@ -9403,17 +9469,55 @@ shlibpath_overrides_runpath=unknown - version_type=none - dynamic_linker="$host_os ld.so" - sys_lib_dlsearch_path_spec="/lib /usr/lib" -+ - if test "$GCC" = yes; then -- 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 ';' >/dev/null ; 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. -- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ lt_search_path_spec=`echo "$lt_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"` -+ 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 -@@ -9434,7 +9538,7 @@ aix3*) - soname_spec='${libname}${release}${shared_ext}$major' - ;; - --aix4* | aix5*) -+aix[4-9]*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -9573,12 +9677,8 @@ darwin* | rhapsody*) - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. -- if test "$GCC" = yes; then -- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` -- else -- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' -- fi -+ -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -@@ -9632,7 +9732,7 @@ freebsd* | dragonfly*) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; -- freebsd*) # from 4.6 on -+ *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; -@@ -9695,7 +9795,7 @@ hpux9* | hpux10* | hpux11*) - postinstall_cmds='chmod 555 $lib' - ;; - --interix3*) -+interix[3-9]*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -9766,7 +9866,7 @@ linux* | k*bsd*-gnu) - - # 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)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -+ 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 - -@@ -9872,6 +9972,10 @@ osf3* | osf4* | osf5*) - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -+rdos*) -+ dynamic_linker=no -+ ;; -+ - solaris*) - version_type=linux - need_lib_prefix=no -@@ -9968,6 +10072,21 @@ esac - echo "${ECHO_T}$dynamic_linker" >&6; } - test "$dynamic_linker" = no && can_build_shared=no - -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -+fi -+ -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -+fi -+ -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+ - variables_saved_for_relink="PATH $shlibpath_var $runpath_var" - if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -@@ -10025,6 +10144,7 @@ else - 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; } - else -@@ -10108,27 +10228,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (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 -@@ -10219,27 +10323,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (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 -@@ -10298,27 +10386,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (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 -@@ -10334,7 +10406,7 @@ 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="-dld" -+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" - else - { echo "$as_me:$LINENO: checking for dlopen" >&5 - echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } -@@ -10399,27 +10471,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (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 -@@ -10478,27 +10534,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (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 -@@ -10558,27 +10598,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (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 -@@ -10638,27 +10662,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (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 -@@ -10674,7 +10682,7 @@ 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="-dld" -+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" - fi - - -@@ -10723,7 +10731,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF --#line 10726 "configure" -+#line 10734 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -10823,7 +10831,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF --#line 10826 "configure" -+#line 10834 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -10950,7 +10958,7 @@ aix3*) - fi - ;; - --aix4* | aix5*) -+aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi -@@ -11006,6 +11014,7 @@ if test -f "$ltmain"; then - predeps \ - postdeps \ - compiler_lib_search_path \ -+ compiler_lib_search_dirs \ - archive_cmds \ - archive_expsym_cmds \ - postinstall_cmds \ -@@ -11021,6 +11030,7 @@ if test -f "$ltmain"; then - module_cmds \ - module_expsym_cmds \ - lt_cv_prog_compiler_c_o \ -+ fix_srcfile_path \ - exclude_expsyms \ - include_expsyms; do - -@@ -11065,7 +11075,7 @@ echo "$as_me: creating $ofile" >&6;} - # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 - # Free Software Foundation, Inc. - # - # This file is part of GNU Libtool: -@@ -11301,6 +11311,10 @@ predeps=$lt_predeps - # shared library. - postdeps=$lt_postdeps - -+# The directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs -+ - # The library search path used internally by the compiler when linking - # a shared library. - compiler_lib_search_path=$lt_compiler_lib_search_path -@@ -11389,7 +11403,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea - sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - - # Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path="$fix_srcfile_path" -+fix_srcfile_path=$lt_fix_srcfile_path - - # Set to yes if exported symbols are required. - always_export_symbols=$always_export_symbols -@@ -11549,6 +11563,7 @@ postdep_objects_CXX= - predeps_CXX= - postdeps_CXX= - compiler_lib_search_path_CXX= -+compiler_lib_search_dirs_CXX= - - # Source file extension for C++ test sources. - ac_ext=cpp -@@ -11558,10 +11573,10 @@ objext=o - objext_CXX=$objext - - # Code to be used in simple compile tests --lt_simple_compile_test_code="int some_variable = 0;\n" -+lt_simple_compile_test_code="int some_variable = 0;" - - # Code to be used in simple link tests --lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n' -+lt_simple_link_test_code='int main(int, char *[]) { return(0); }' - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - -@@ -11577,16 +11592,16 @@ compiler=$CC - - # save warnings/boilerplate of simple test code - ac_outfile=conftest.$ac_objext --printf "$lt_simple_compile_test_code" >conftest.$ac_ext -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext - eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_compiler_boilerplate=`cat conftest.err` - $rm conftest* - - ac_outfile=conftest.$ac_objext --printf "$lt_simple_link_test_code" >conftest.$ac_ext -+echo "$lt_simple_link_test_code" >conftest.$ac_ext - eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_linker_boilerplate=`cat conftest.err` --$rm conftest* -+$rm -r conftest* - - - # Allow CC to be a program name with arguments. -@@ -11793,7 +11808,7 @@ case $host_os in - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -- aix4* | aix5*) -+ aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. -@@ -11806,7 +11821,7 @@ case $host_os in - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. -- case $host_os in aix4.[23]|aix4.[23].*|aix5*) -+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) -@@ -11842,7 +11857,7 @@ case $host_os in - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 -- hardcode_direct_CXX=yes -+ : - else - # We have old collect2 - hardcode_direct_CXX=unsupported -@@ -11910,33 +11925,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -- --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'` -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_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 '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'`; fi -+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 -@@ -11986,33 +11992,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -- --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'` -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_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 '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'`; fi -+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 -@@ -12082,59 +12079,31 @@ if test -z "$aix_libpath"; then aix_libp - fi - ;; - darwin* | rhapsody*) -- case $host_os in -- rhapsody* | darwin1.[012]) -- allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress' -- ;; -- *) # Darwin 1.3 on -- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -- else -- case ${MACOSX_DEPLOYMENT_TARGET} in -- 10.[012]) -- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -- ;; -- 10.*) -- allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup' -- ;; -- esac -- fi -- ;; -- esac - archive_cmds_need_lc_CXX=no - hardcode_direct_CXX=no - hardcode_automatic_CXX=yes - hardcode_shlibpath_var_CXX=unsupported - whole_archive_flag_spec_CXX='' - link_all_deplibs_CXX=yes -- -- if test "$GXX" = yes ; then -- lt_int_apple_cc_single_mod=no -+ allow_undefined_flag_CXX="$_lt_dar_allow_undefined" -+ if test "$GXX" = yes ; then - output_verbose_link_cmd='echo' -- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then -- lt_int_apple_cc_single_mod=yes -+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ if test "$lt_cv_apple_cc_single_mod" != "yes"; then -+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" -+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" - fi -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- else -- archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- fi -- module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- else -- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- fi -- module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' -- archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' -+ archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) -@@ -12217,9 +12186,7 @@ if test -z "$aix_libpath"; then aix_libp - hardcode_libdir_separator_CXX=: - - case $host_cpu in -- hppa*64*|ia64*) -- hardcode_libdir_flag_spec_ld_CXX='+b $libdir' -- ;; -+ hppa*64*|ia64*) ;; - *) - export_dynamic_flag_spec_CXX='${wl}-E' - ;; -@@ -12287,7 +12254,7 @@ if test -z "$aix_libpath"; then aix_libp - ;; - esac - ;; -- interix3*) -+ interix[3-9]*) - hardcode_direct_CXX=no - hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -@@ -12379,7 +12346,7 @@ if test -z "$aix_libpath"; then aix_libp - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; -- pgCC*) -+ pgCC* | pgcpp*) - # Portland Group C++ compiler - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -@@ -12407,6 +12374,29 @@ if test -z "$aix_libpath"; then aix_libp - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ no_undefined_flag_CXX=' -zdefs' -+ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' -+ hardcode_libdir_flag_spec_CXX='-R$libdir' -+ whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ -+ # Not sure whether something based on -+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 -+ # would be better. -+ output_verbose_link_cmd='echo' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -xar", where "CC" is the Sun C++ compiler. This is -+ # necessary to make sure instantiated templates are included -+ # in the archive. -+ old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' -+ ;; -+ esac -+ ;; - esac - ;; - lynxos*) -@@ -12445,16 +12435,20 @@ if test -z "$aix_libpath"; then aix_libp - ld_shlibs_CXX=no - ;; - openbsd*) -- hardcode_direct_CXX=yes -- hardcode_shlibpath_var_CXX=no -- archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' -- export_dynamic_flag_spec_CXX='${wl}-E' -- whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ if test -f /usr/libexec/ld.so; then -+ hardcode_direct_CXX=yes -+ hardcode_shlibpath_var_CXX=no -+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' -+ export_dynamic_flag_spec_CXX='${wl}-E' -+ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ fi -+ output_verbose_link_cmd='echo' -+ else -+ ld_shlibs_CXX=no - fi -- output_verbose_link_cmd='echo' - ;; - osf3*) - case $cc_basename in -@@ -12616,15 +12610,10 @@ if test -z "$aix_libpath"; then aix_libp - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) -- # The C++ compiler is used as linker so we must use $wl -- # flag to pass the commands to the underlying system -- # linker. We must also pass each convience library through -- # to the system linker between allextract/defaultextract. -- # The C++ compiler will combine linker options so we -- # cannot just pass the convience library names through -- # without $wl. -+ # The compiler driver will combine and reorder linker options, -+ # but understands `-z linker_flag'. - # Supported since Solaris 2.6 (maybe 2.5.1?) -- whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' -+ whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' - ;; - esac - link_all_deplibs_CXX=yes -@@ -12671,6 +12660,12 @@ if test -z "$aix_libpath"; then aix_libp - fi - - hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' -+ case $host_os in -+ solaris2.[0-5] | solaris2.[0-5].*) ;; -+ *) -+ whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ ;; -+ esac - fi - ;; - esac -@@ -12758,7 +12753,6 @@ test "$ld_shlibs_CXX" = no && can_build_ - GCC_CXX="$GXX" - LD_CXX="$LD" - -- - cat > conftest.$ac_ext <<EOF - class Foo - { -@@ -12860,9 +12854,14 @@ fi - - $rm -f confest.$objext - -+compiler_lib_search_dirs_CXX= -+if test -n "$compiler_lib_search_path_CXX"; then -+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -+fi -+ - # PORTME: override above test on systems where it is broken - case $host_os in --interix3*) -+interix[3-9]*) - # Interix 3.5 installs completely hosed .la files for C++, so rather than - # hack all around it, let's just trust "g++" to DTRT. - predep_objects_CXX= -@@ -12870,19 +12869,51 @@ interix3*) - postdeps_CXX= - ;; - -+linux*) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ # -+ # The more standards-conforming stlport4 library is -+ # incompatible with the Cstd library. Avoid specifying -+ # it if it's in CXXFLAGS. Ignore libCrun as -+ # -library=stlport4 depends on it. -+ case " $CXX $CXXFLAGS " in -+ *" -library=stlport4 "*) -+ solaris_use_stlport4=yes -+ ;; -+ esac -+ if test "$solaris_use_stlport4" != yes; then -+ postdeps_CXX='-library=Cstd -library=Crun' -+ fi -+ ;; -+ esac -+ ;; -+ - solaris*) - case $cc_basename in - CC*) -+ # The more standards-conforming stlport4 library is -+ # incompatible with the Cstd library. Avoid specifying -+ # it if it's in CXXFLAGS. Ignore libCrun as -+ # -library=stlport4 depends on it. -+ case " $CXX $CXXFLAGS " in -+ *" -library=stlport4 "*) -+ solaris_use_stlport4=yes -+ ;; -+ esac -+ - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. -- postdeps_CXX='-lCstd -lCrun' -+ if test "$solaris_use_stlport4" != yes; then -+ postdeps_CXX='-library=Cstd -library=Crun' -+ fi - ;; - esac - ;; - esac - -- - case " $postdeps_CXX " in - *" -lc "*) archive_cmds_need_lc_CXX=no ;; - esac -@@ -12913,12 +12944,14 @@ echo $ECHO_N "checking for $compiler opt - # like `-m68040'. - lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' - ;; -- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; -- mingw* | os2* | pw32*) -+ mingw* | cygwin* | os2* | pw32*) - # 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 -+ # (--disable-auto-import) libraries - lt_prog_compiler_pic_CXX='-DDLL_EXPORT' - ;; - darwin* | rhapsody*) -@@ -12930,7 +12963,7 @@ echo $ECHO_N "checking for $compiler opt - # DJGPP does not support shared libraries at all - lt_prog_compiler_pic_CXX= - ;; -- interix3*) -+ interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; -@@ -12956,7 +12989,7 @@ echo $ECHO_N "checking for $compiler opt - esac - else - case $host_os in -- aix4* | aix5*) -+ aix[4-9]*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor -@@ -13052,7 +13085,7 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-static' - ;; -- pgCC*) -+ pgCC* | pgcpp*) - # Portland Group C++ compiler. - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-fpic' -@@ -13066,6 +13099,14 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_static_CXX='-non_shared' - ;; - *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ lt_prog_compiler_pic_CXX='-KPIC' -+ lt_prog_compiler_static_CXX='-Bstatic' -+ lt_prog_compiler_wl_CXX='-Qoption ld ' -+ ;; -+ esac - ;; - esac - ;; -@@ -13175,12 +13216,12 @@ if test -n "$lt_prog_compiler_pic_CXX"; - - { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 - echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } --if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then -+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_pic_works_CXX=no -+ lt_cv_prog_compiler_pic_works_CXX=no - ac_outfile=conftest.$ac_objext -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. -@@ -13191,27 +13232,27 @@ else - -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:13194: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:13235: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:13198: \$? = $ac_status" >&5 -+ echo "$as_me:13239: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -- lt_prog_compiler_pic_works_CXX=yes -+ lt_cv_prog_compiler_pic_works_CXX=yes - fi - fi - $rm conftest* - - fi --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 --echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; } - --if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then -+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then - case $lt_prog_compiler_pic_CXX in - "" | " "*) ;; - *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; -@@ -13238,13 +13279,13 @@ esac - wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" - { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 - echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } --if test "${lt_prog_compiler_static_works_CXX+set}" = set; then -+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_static_works_CXX=no -+ lt_cv_prog_compiler_static_works_CXX=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" -- printf "$lt_simple_link_test_code" > conftest.$ac_ext -+ echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings -@@ -13254,20 +13295,20 @@ else - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then -- lt_prog_compiler_static_works_CXX=yes -+ lt_cv_prog_compiler_static_works_CXX=yes - fi - else -- lt_prog_compiler_static_works_CXX=yes -+ lt_cv_prog_compiler_static_works_CXX=yes - fi - fi -- $rm conftest* -+ $rm -r conftest* - LDFLAGS="$save_LDFLAGS" - - fi --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 --echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; } - --if test x"$lt_prog_compiler_static_works_CXX" = xyes; then -+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then - : - else - lt_prog_compiler_static_CXX= -@@ -13284,7 +13325,7 @@ else - mkdir conftest - cd conftest - mkdir out -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or -@@ -13295,11 +13336,11 @@ else - -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:13298: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:13339: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:13302: \$? = $ac_status" >&5 -+ echo "$as_me:13343: \$? = $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 -@@ -13352,7 +13393,7 @@ echo $ECHO_N "checking whether the $comp - - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - case $host_os in -- aix4* | aix5*) -+ aix[4-9]*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -@@ -13365,7 +13406,7 @@ echo $ECHO_N "checking whether the $comp - export_symbols_cmds_CXX="$ltdll_cmds" - ;; - cygwin* | mingw*) -- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - ;; - linux* | k*bsd*-gnu) - link_all_deplibs_CXX=no -@@ -13374,6 +13415,7 @@ echo $ECHO_N "checking whether the $comp - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac -+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - - { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 - echo "${ECHO_T}$ld_shlibs_CXX" >&6; } -@@ -13399,7 +13441,7 @@ x|xyes) - { 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* -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 -@@ -13457,20 +13499,7 @@ shlibpath_overrides_runpath=unknown - version_type=none - dynamic_linker="$host_os ld.so" - sys_lib_dlsearch_path_spec="/lib /usr/lib" --if test "$GCC" = yes; then -- 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 ';' >/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. -- 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 --else -- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" --fi -+ - need_lib_prefix=unknown - hardcode_into_libs=no - -@@ -13488,7 +13517,7 @@ aix3*) - soname_spec='${libname}${release}${shared_ext}$major' - ;; - --aix4* | aix5*) -+aix[4-9]*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -13627,12 +13656,7 @@ darwin* | rhapsody*) - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. -- if test "$GCC" = yes; then -- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` -- else -- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' -- fi -+ - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -@@ -13686,7 +13710,7 @@ freebsd* | dragonfly*) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; -- freebsd*) # from 4.6 on -+ *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; -@@ -13749,7 +13773,7 @@ hpux9* | hpux10* | hpux11*) - postinstall_cmds='chmod 555 $lib' - ;; - --interix3*) -+interix[3-9]*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -13820,7 +13844,7 @@ linux* | k*bsd*-gnu) - - # 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)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -+ 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 - -@@ -13926,6 +13950,10 @@ osf3* | osf4* | osf5*) - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -+rdos*) -+ dynamic_linker=no -+ ;; -+ - solaris*) - version_type=linux - need_lib_prefix=no -@@ -14022,6 +14050,21 @@ esac - echo "${ECHO_T}$dynamic_linker" >&6; } - test "$dynamic_linker" = no && can_build_shared=no - -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -+fi -+ -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -+fi -+ -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+ - variables_saved_for_relink="PATH $shlibpath_var $runpath_var" - if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -@@ -14105,6 +14148,7 @@ if test -f "$ltmain"; then - predeps_CXX \ - postdeps_CXX \ - compiler_lib_search_path_CXX \ -+ compiler_lib_search_dirs_CXX \ - archive_cmds_CXX \ - archive_expsym_cmds_CXX \ - postinstall_cmds_CXX \ -@@ -14120,6 +14164,7 @@ if test -f "$ltmain"; then - module_cmds_CXX \ - module_expsym_cmds_CXX \ - lt_cv_prog_compiler_c_o_CXX \ -+ fix_srcfile_path_CXX \ - exclude_expsyms_CXX \ - include_expsyms_CXX; do - -@@ -14352,6 +14397,10 @@ predeps=$lt_predeps_CXX - # shared library. - postdeps=$lt_postdeps_CXX - -+# The directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX -+ - # The library search path used internally by the compiler when linking - # a shared library. - compiler_lib_search_path=$lt_compiler_lib_search_path_CXX -@@ -14440,7 +14489,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea - sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - - # Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path="$fix_srcfile_path_CXX" -+fix_srcfile_path=$lt_fix_srcfile_path - - # Set to yes if exported symbols are required. - always_export_symbols=$always_export_symbols_CXX -@@ -14531,10 +14580,17 @@ objext=o - objext_F77=$objext - - # Code to be used in simple compile tests --lt_simple_compile_test_code=" subroutine t\n return\n end\n" -+lt_simple_compile_test_code="\ -+ subroutine t -+ return -+ end -+" - - # Code to be used in simple link tests --lt_simple_link_test_code=" program t\n end\n" -+lt_simple_link_test_code="\ -+ program t -+ end -+" - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - -@@ -14550,16 +14606,16 @@ compiler=$CC - - # save warnings/boilerplate of simple test code - ac_outfile=conftest.$ac_objext --printf "$lt_simple_compile_test_code" >conftest.$ac_ext -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext - eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_compiler_boilerplate=`cat conftest.err` - $rm conftest* - - ac_outfile=conftest.$ac_objext --printf "$lt_simple_link_test_code" >conftest.$ac_ext -+echo "$lt_simple_link_test_code" >conftest.$ac_ext - eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_linker_boilerplate=`cat conftest.err` --$rm conftest* -+$rm -r conftest* - - - # Allow CC to be a program name with arguments. -@@ -14597,7 +14653,7 @@ aix3*) - postinstall_cmds='$RANLIB $lib' - fi - ;; --aix4* | aix5*) -+aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi -@@ -14643,13 +14699,15 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' - ;; - -- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - -- mingw* | pw32* | os2*) -+ mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries - lt_prog_compiler_pic_F77='-DDLL_EXPORT' - ;; - -@@ -14659,7 +14717,7 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_pic_F77='-fno-common' - ;; - -- interix3*) -+ interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; -@@ -14717,7 +14775,7 @@ echo $ECHO_N "checking for $compiler opt - esac - ;; - -- mingw* | pw32* | os2*) -+ mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic_F77='-DDLL_EXPORT' -@@ -14769,6 +14827,22 @@ echo $ECHO_N "checking for $compiler opt - # All Alpha code is PIC. - lt_prog_compiler_static_F77='-non_shared' - ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C 5.9 -+ lt_prog_compiler_pic_F77='-KPIC' -+ lt_prog_compiler_static_F77='-Bstatic' -+ lt_prog_compiler_wl_F77='-Wl,' -+ ;; -+ *Sun\ F*) -+ # Sun Fortran 8.3 passes all unrecognized flags to the linker -+ lt_prog_compiler_pic_F77='-KPIC' -+ lt_prog_compiler_static_F77='-Bstatic' -+ lt_prog_compiler_wl_F77='' -+ ;; -+ esac -+ ;; - esac - ;; - -@@ -14778,6 +14852,10 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_static_F77='-non_shared' - ;; - -+ rdos*) -+ lt_prog_compiler_static_F77='-non_shared' -+ ;; -+ - solaris*) - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' -@@ -14840,12 +14918,12 @@ if test -n "$lt_prog_compiler_pic_F77"; - - { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 - echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } --if test "${lt_prog_compiler_pic_works_F77+set}" = set; then -+if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_pic_works_F77=no -+ lt_cv_prog_compiler_pic_works_F77=no - ac_outfile=conftest.$ac_objext -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_F77" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. -@@ -14856,27 +14934,27 @@ else - -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:14859: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:14937: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:14863: \$? = $ac_status" >&5 -+ echo "$as_me:14941: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -- lt_prog_compiler_pic_works_F77=yes -+ lt_cv_prog_compiler_pic_works_F77=yes - fi - fi - $rm conftest* - - fi --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 --echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; } - --if test x"$lt_prog_compiler_pic_works_F77" = xyes; then -+if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then - case $lt_prog_compiler_pic_F77 in - "" | " "*) ;; - *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; -@@ -14903,13 +14981,13 @@ esac - wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" - { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 - echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } --if test "${lt_prog_compiler_static_works_F77+set}" = set; then -+if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_static_works_F77=no -+ lt_cv_prog_compiler_static_works_F77=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" -- printf "$lt_simple_link_test_code" > conftest.$ac_ext -+ echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings -@@ -14919,20 +14997,20 @@ else - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then -- lt_prog_compiler_static_works_F77=yes -+ lt_cv_prog_compiler_static_works_F77=yes - fi - else -- lt_prog_compiler_static_works_F77=yes -+ lt_cv_prog_compiler_static_works_F77=yes - fi - fi -- $rm conftest* -+ $rm -r conftest* - LDFLAGS="$save_LDFLAGS" - - fi --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 --echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; } - --if test x"$lt_prog_compiler_static_works_F77" = xyes; then -+if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then - : - else - lt_prog_compiler_static_F77= -@@ -14949,7 +15027,7 @@ else - mkdir conftest - cd conftest - mkdir out -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or -@@ -14960,11 +15038,11 @@ else - -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:14963: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:15041: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:14967: \$? = $ac_status" >&5 -+ echo "$as_me:15045: \$? = $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 -@@ -15044,12 +15122,13 @@ echo $ECHO_N "checking whether the $comp - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. -- exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_" -+ exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. -+ # Exclude shared library initialization/finalization symbols. - extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - for cc_temp in $compiler""; do -@@ -15108,7 +15187,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed - - - # See if GNU ld supports shared libraries. - case $host_os in -- aix3* | aix4* | aix5*) -+ aix[3-9]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs_F77=no -@@ -15156,7 +15235,7 @@ EOF - allow_undefined_flag_F77=unsupported - always_export_symbols_F77=no - enable_shared_with_static_runtimes_F77=yes -- export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -15174,7 +15253,7 @@ EOF - fi - ;; - -- interix3*) -+ interix[3-9]*) - hardcode_direct_F77=no - hardcode_shlibpath_var_F77=no - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' -@@ -15189,7 +15268,7 @@ EOF - archive_expsym_cmds_F77='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' - ;; - -- linux* | k*bsd*-gnu) -+ gnu* | linux* | k*bsd*-gnu) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_addflag= - case $cc_basename,$host_cpu in -@@ -15207,13 +15286,22 @@ EOF - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - esac -- archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) # Sun C 5.9 -+ whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_sharedflag='-G' ;; -+ *Sun\ F*) # Sun Fortran 8.3 -+ tmp_sharedflag='-G' ;; -+ *) -+ tmp_sharedflag='-shared' ;; -+ esac -+ archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test $supports_anon_versioning = yes; then - archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - $echo "local: *; };" >> $output_objdir/$libname.ver~ -- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - link_all_deplibs_F77=no - else -@@ -15319,7 +15407,7 @@ _LT_EOF - fi - ;; - -- aix4* | aix5*) -+ aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. -@@ -15339,7 +15427,7 @@ _LT_EOF - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. -- case $host_os in aix4.[23]|aix4.[23].*|aix5*) -+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes -@@ -15373,7 +15461,7 @@ _LT_EOF - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 -- hardcode_direct_F77=yes -+ : - else - # We have old collect2 - hardcode_direct_F77=unsupported -@@ -15431,33 +15519,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -- --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'` -+ (exit $ac_status); } && { -+ test -z "$ac_f77_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 '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'`; fi -+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 -@@ -15496,33 +15575,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -- --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'` -+ (exit $ac_status); } && { -+ test -z "$ac_f77_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 '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'`; fi -+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 -@@ -15576,7 +15646,7 @@ if test -z "$aix_libpath"; then aix_libp - # The linker will automatically build a .lib file if we build a DLL. - old_archive_From_new_cmds_F77='true' - # FIXME: Should let the user specify the lib program. -- old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs' -+ old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path_F77='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes_F77=yes - ;; -@@ -15609,19 +15679,18 @@ if test -z "$aix_libpath"; then aix_libp - link_all_deplibs_F77=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' -- archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' -- archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' -+ archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) -@@ -15783,24 +15852,28 @@ if test -z "$aix_libpath"; then aix_libp - ;; - - openbsd*) -- hardcode_direct_F77=yes -- hardcode_shlibpath_var_F77=no -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' -- export_dynamic_flag_spec_F77='${wl}-E' -+ if test -f /usr/libexec/ld.so; then -+ hardcode_direct_F77=yes -+ hardcode_shlibpath_var_F77=no -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec_F77='${wl}-E' -+ else -+ case $host_os in -+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec_F77='-R$libdir' -+ ;; -+ *) -+ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' -+ ;; -+ esac -+ fi - else -- case $host_os in -- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec_F77='-R$libdir' -- ;; -- *) -- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' -- ;; -- esac -+ ld_shlibs_F77=no - fi - ;; - -@@ -15859,17 +15932,16 @@ if test -z "$aix_libpath"; then aix_libp - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) -- # The compiler driver will combine linker options so we -- # cannot just pass the convience library names through -- # without $wl, iff we do not link with $LD. -- # Luckily, gcc supports the same syntax we need for Sun Studio. -+ # 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?) -- case $wlarc in -- '') -- whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;; -- *) -- whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; -- esac ;; -+ if test "$GCC" = yes; then -+ whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ else -+ whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' -+ fi -+ ;; - esac - link_all_deplibs_F77=yes - ;; -@@ -15926,7 +15998,7 @@ if test -z "$aix_libpath"; then aix_libp - fi - ;; - -- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) -+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag_F77='${wl}-z,text' - archive_cmds_need_lc_F77=no - hardcode_shlibpath_var_F77=no -@@ -16003,7 +16075,7 @@ x|xyes) - { 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* -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 -@@ -16061,20 +16133,7 @@ shlibpath_overrides_runpath=unknown - version_type=none - dynamic_linker="$host_os ld.so" - sys_lib_dlsearch_path_spec="/lib /usr/lib" --if test "$GCC" = yes; then -- 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 ';' >/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. -- 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 --else -- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" --fi -+ - need_lib_prefix=unknown - hardcode_into_libs=no - -@@ -16092,7 +16151,7 @@ aix3*) - soname_spec='${libname}${release}${shared_ext}$major' - ;; - --aix4* | aix5*) -+aix[4-9]*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -16231,12 +16290,7 @@ darwin* | rhapsody*) - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. -- if test "$GCC" = yes; then -- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` -- else -- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' -- fi -+ - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -@@ -16290,7 +16344,7 @@ freebsd* | dragonfly*) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; -- freebsd*) # from 4.6 on -+ *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; -@@ -16353,7 +16407,7 @@ hpux9* | hpux10* | hpux11*) - postinstall_cmds='chmod 555 $lib' - ;; - --interix3*) -+interix[3-9]*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -16424,7 +16478,7 @@ linux* | k*bsd*-gnu) - - # 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)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -+ 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 - -@@ -16530,6 +16584,10 @@ osf3* | osf4* | osf5*) - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -+rdos*) -+ dynamic_linker=no -+ ;; -+ - solaris*) - version_type=linux - need_lib_prefix=no -@@ -16626,6 +16684,21 @@ esac - echo "${ECHO_T}$dynamic_linker" >&6; } - test "$dynamic_linker" = no && can_build_shared=no - -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -+fi -+ -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -+fi -+ -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+ - variables_saved_for_relink="PATH $shlibpath_var $runpath_var" - if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -@@ -16709,6 +16782,7 @@ if test -f "$ltmain"; then - predeps_F77 \ - postdeps_F77 \ - compiler_lib_search_path_F77 \ -+ compiler_lib_search_dirs_F77 \ - archive_cmds_F77 \ - archive_expsym_cmds_F77 \ - postinstall_cmds_F77 \ -@@ -16724,6 +16798,7 @@ if test -f "$ltmain"; then - module_cmds_F77 \ - module_expsym_cmds_F77 \ - lt_cv_prog_compiler_c_o_F77 \ -+ fix_srcfile_path_F77 \ - exclude_expsyms_F77 \ - include_expsyms_F77; do - -@@ -16956,6 +17031,10 @@ predeps=$lt_predeps_F77 - # shared library. - postdeps=$lt_postdeps_F77 - -+# The directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77 -+ - # The library search path used internally by the compiler when linking - # a shared library. - compiler_lib_search_path=$lt_compiler_lib_search_path_F77 -@@ -17044,7 +17123,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea - sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - - # Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path="$fix_srcfile_path_F77" -+fix_srcfile_path=$lt_fix_srcfile_path - - # Set to yes if exported symbols are required. - always_export_symbols=$always_export_symbols_F77 -@@ -17102,10 +17181,10 @@ objext=o - objext_GCJ=$objext - - # Code to be used in simple compile tests --lt_simple_compile_test_code="class foo {}\n" -+lt_simple_compile_test_code="class foo {}" - - # Code to be used in simple link tests --lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' -+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }' - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - -@@ -17121,16 +17200,16 @@ compiler=$CC - - # save warnings/boilerplate of simple test code - ac_outfile=conftest.$ac_objext --printf "$lt_simple_compile_test_code" >conftest.$ac_ext -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext - eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_compiler_boilerplate=`cat conftest.err` - $rm conftest* - - ac_outfile=conftest.$ac_objext --printf "$lt_simple_link_test_code" >conftest.$ac_ext -+echo "$lt_simple_link_test_code" >conftest.$ac_ext - eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_linker_boilerplate=`cat conftest.err` --$rm conftest* -+$rm -r conftest* - - - # Allow CC to be a program name with arguments. -@@ -17168,7 +17247,7 @@ if test "${lt_cv_prog_compiler_rtti_exce - else - lt_cv_prog_compiler_rtti_exceptions=no - ac_outfile=conftest.$ac_objext -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. -@@ -17179,11 +17258,11 @@ else - -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:17182: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:17261: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:17186: \$? = $ac_status" >&5 -+ echo "$as_me:17265: \$? = $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. -@@ -17234,14 +17313,16 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' - ;; - -- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - -- mingw* | pw32* | os2*) -+ mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). -- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries -+ - ;; - - darwin* | rhapsody*) -@@ -17250,7 +17331,7 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_pic_GCJ='-fno-common' - ;; - -- interix3*) -+ interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; -@@ -17308,10 +17389,10 @@ echo $ECHO_N "checking for $compiler opt - esac - ;; - -- mingw* | pw32* | os2*) -+ mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). -- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' -+ - ;; - - hpux9* | hpux10* | hpux11*) -@@ -17360,6 +17441,22 @@ echo $ECHO_N "checking for $compiler opt - # All Alpha code is PIC. - lt_prog_compiler_static_GCJ='-non_shared' - ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C 5.9 -+ lt_prog_compiler_pic_GCJ='-KPIC' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ ;; -+ *Sun\ F*) -+ # Sun Fortran 8.3 passes all unrecognized flags to the linker -+ lt_prog_compiler_pic_GCJ='-KPIC' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ lt_prog_compiler_wl_GCJ='' -+ ;; -+ esac -+ ;; - esac - ;; - -@@ -17369,6 +17466,10 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_static_GCJ='-non_shared' - ;; - -+ rdos*) -+ lt_prog_compiler_static_GCJ='-non_shared' -+ ;; -+ - solaris*) - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-Bstatic' -@@ -17431,12 +17532,12 @@ if test -n "$lt_prog_compiler_pic_GCJ"; - - { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 - echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } --if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then -+if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_pic_works_GCJ=no -+ lt_cv_prog_compiler_pic_works_GCJ=no - ac_outfile=conftest.$ac_objext -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_GCJ" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. -@@ -17447,27 +17548,27 @@ else - -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:17450: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:17551: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:17454: \$? = $ac_status" >&5 -+ echo "$as_me:17555: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -- lt_prog_compiler_pic_works_GCJ=yes -+ lt_cv_prog_compiler_pic_works_GCJ=yes - fi - fi - $rm conftest* - - fi --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 --echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; } - --if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then -+if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then - case $lt_prog_compiler_pic_GCJ in - "" | " "*) ;; - *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;; -@@ -17494,13 +17595,13 @@ esac - wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" - { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 - echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } --if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then -+if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_prog_compiler_static_works_GCJ=no -+ lt_cv_prog_compiler_static_works_GCJ=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" -- printf "$lt_simple_link_test_code" > conftest.$ac_ext -+ echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings -@@ -17510,20 +17611,20 @@ else - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then -- lt_prog_compiler_static_works_GCJ=yes -+ lt_cv_prog_compiler_static_works_GCJ=yes - fi - else -- lt_prog_compiler_static_works_GCJ=yes -+ lt_cv_prog_compiler_static_works_GCJ=yes - fi - fi -- $rm conftest* -+ $rm -r conftest* - LDFLAGS="$save_LDFLAGS" - - fi --{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 --echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; } - --if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then -+if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then - : - else - lt_prog_compiler_static_GCJ= -@@ -17540,7 +17641,7 @@ else - mkdir conftest - cd conftest - mkdir out -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or -@@ -17551,11 +17652,11 @@ else - -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:17554: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:17655: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:17558: \$? = $ac_status" >&5 -+ echo "$as_me:17659: \$? = $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 -@@ -17635,12 +17736,13 @@ echo $ECHO_N "checking whether the $comp - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. -- exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_" -+ exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. -+ # Exclude shared library initialization/finalization symbols. - extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - for cc_temp in $compiler""; do -@@ -17699,7 +17801,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed - - - # See if GNU ld supports shared libraries. - case $host_os in -- aix3* | aix4* | aix5*) -+ aix[3-9]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs_GCJ=no -@@ -17747,7 +17849,7 @@ EOF - allow_undefined_flag_GCJ=unsupported - always_export_symbols_GCJ=no - enable_shared_with_static_runtimes_GCJ=yes -- export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -17765,7 +17867,7 @@ EOF - fi - ;; - -- interix3*) -+ interix[3-9]*) - hardcode_direct_GCJ=no - hardcode_shlibpath_var_GCJ=no - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' -@@ -17780,7 +17882,7 @@ EOF - archive_expsym_cmds_GCJ='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' - ;; - -- linux* | k*bsd*-gnu) -+ gnu* | linux* | k*bsd*-gnu) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_addflag= - case $cc_basename,$host_cpu in -@@ -17798,13 +17900,22 @@ EOF - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - esac -- archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) # Sun C 5.9 -+ whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_sharedflag='-G' ;; -+ *Sun\ F*) # Sun Fortran 8.3 -+ tmp_sharedflag='-G' ;; -+ *) -+ tmp_sharedflag='-shared' ;; -+ esac -+ archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test $supports_anon_versioning = yes; then - archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - $echo "local: *; };" >> $output_objdir/$libname.ver~ -- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - link_all_deplibs_GCJ=no - else -@@ -17910,7 +18021,7 @@ _LT_EOF - fi - ;; - -- aix4* | aix5*) -+ aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. -@@ -17930,7 +18041,7 @@ _LT_EOF - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. -- case $host_os in aix4.[23]|aix4.[23].*|aix5*) -+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes -@@ -17964,7 +18075,7 @@ _LT_EOF - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 -- hardcode_direct_GCJ=yes -+ : - else - # We have old collect2 - hardcode_direct_GCJ=unsupported -@@ -18032,33 +18143,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -- --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'` -+ (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 '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'`; fi -+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 -@@ -18107,33 +18209,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -- --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'` -+ (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 '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'`; fi -+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 -@@ -18187,7 +18280,7 @@ if test -z "$aix_libpath"; then aix_libp - # The linker will automatically build a .lib file if we build a DLL. - old_archive_From_new_cmds_GCJ='true' - # FIXME: Should let the user specify the lib program. -- old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs' -+ old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes_GCJ=yes - ;; -@@ -18220,19 +18313,18 @@ if test -z "$aix_libpath"; then aix_libp - link_all_deplibs_GCJ=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' -- archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' -- archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' -+ archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) -@@ -18394,24 +18486,28 @@ if test -z "$aix_libpath"; then aix_libp - ;; - - openbsd*) -- hardcode_direct_GCJ=yes -- hardcode_shlibpath_var_GCJ=no -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' -- export_dynamic_flag_spec_GCJ='${wl}-E' -+ if test -f /usr/libexec/ld.so; then -+ hardcode_direct_GCJ=yes -+ hardcode_shlibpath_var_GCJ=no -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec_GCJ='${wl}-E' -+ else -+ case $host_os in -+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec_GCJ='-R$libdir' -+ ;; -+ *) -+ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' -+ ;; -+ esac -+ fi - else -- case $host_os in -- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec_GCJ='-R$libdir' -- ;; -- *) -- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' -- ;; -- esac -+ ld_shlibs_GCJ=no - fi - ;; - -@@ -18470,17 +18566,16 @@ if test -z "$aix_libpath"; then aix_libp - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) -- # The compiler driver will combine linker options so we -- # cannot just pass the convience library names through -- # without $wl, iff we do not link with $LD. -- # Luckily, gcc supports the same syntax we need for Sun Studio. -+ # 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?) -- case $wlarc in -- '') -- whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;; -- *) -- whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; -- esac ;; -+ if test "$GCC" = yes; then -+ whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ else -+ whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' -+ fi -+ ;; - esac - link_all_deplibs_GCJ=yes - ;; -@@ -18537,7 +18632,7 @@ if test -z "$aix_libpath"; then aix_libp - fi - ;; - -- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) -+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag_GCJ='${wl}-z,text' - archive_cmds_need_lc_GCJ=no - hardcode_shlibpath_var_GCJ=no -@@ -18614,7 +18709,7 @@ x|xyes) - { 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* -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 -@@ -18672,20 +18767,7 @@ shlibpath_overrides_runpath=unknown - version_type=none - dynamic_linker="$host_os ld.so" - sys_lib_dlsearch_path_spec="/lib /usr/lib" --if test "$GCC" = yes; then -- 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 ';' >/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. -- 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 --else -- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" --fi -+ - need_lib_prefix=unknown - hardcode_into_libs=no - -@@ -18703,7 +18785,7 @@ aix3*) - soname_spec='${libname}${release}${shared_ext}$major' - ;; - --aix4* | aix5*) -+aix[4-9]*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -18842,12 +18924,7 @@ darwin* | rhapsody*) - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. -- if test "$GCC" = yes; then -- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` -- else -- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' -- fi -+ - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -@@ -18901,7 +18978,7 @@ freebsd* | dragonfly*) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; -- freebsd*) # from 4.6 on -+ *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; -@@ -18964,7 +19041,7 @@ hpux9* | hpux10* | hpux11*) - postinstall_cmds='chmod 555 $lib' - ;; - --interix3*) -+interix[3-9]*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -19035,7 +19112,7 @@ linux* | k*bsd*-gnu) - - # 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)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -+ 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 - -@@ -19141,6 +19218,10 @@ osf3* | osf4* | osf5*) - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -+rdos*) -+ dynamic_linker=no -+ ;; -+ - solaris*) - version_type=linux - need_lib_prefix=no -@@ -19237,6 +19318,21 @@ esac - echo "${ECHO_T}$dynamic_linker" >&6; } - test "$dynamic_linker" = no && can_build_shared=no - -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -+fi -+ -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -+fi -+ -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+ - variables_saved_for_relink="PATH $shlibpath_var $runpath_var" - if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -@@ -19320,6 +19416,7 @@ if test -f "$ltmain"; then - predeps_GCJ \ - postdeps_GCJ \ - compiler_lib_search_path_GCJ \ -+ compiler_lib_search_dirs_GCJ \ - archive_cmds_GCJ \ - archive_expsym_cmds_GCJ \ - postinstall_cmds_GCJ \ -@@ -19335,6 +19432,7 @@ if test -f "$ltmain"; then - module_cmds_GCJ \ - module_expsym_cmds_GCJ \ - lt_cv_prog_compiler_c_o_GCJ \ -+ fix_srcfile_path_GCJ \ - exclude_expsyms_GCJ \ - include_expsyms_GCJ; do - -@@ -19567,6 +19665,10 @@ predeps=$lt_predeps_GCJ - # shared library. - postdeps=$lt_postdeps_GCJ - -+# The directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ -+ - # The library search path used internally by the compiler when linking - # a shared library. - compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ -@@ -19655,7 +19757,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea - sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - - # Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path="$fix_srcfile_path_GCJ" -+fix_srcfile_path=$lt_fix_srcfile_path - - # Set to yes if exported symbols are required. - always_export_symbols=$always_export_symbols_GCJ -@@ -19712,7 +19814,7 @@ objext=o - objext_RC=$objext - - # Code to be used in simple compile tests --lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' -+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' - - # Code to be used in simple link tests - lt_simple_link_test_code="$lt_simple_compile_test_code" -@@ -19731,16 +19833,16 @@ compiler=$CC - - # save warnings/boilerplate of simple test code - ac_outfile=conftest.$ac_objext --printf "$lt_simple_compile_test_code" >conftest.$ac_ext -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext - eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_compiler_boilerplate=`cat conftest.err` - $rm conftest* - - ac_outfile=conftest.$ac_objext --printf "$lt_simple_link_test_code" >conftest.$ac_ext -+echo "$lt_simple_link_test_code" >conftest.$ac_ext - eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err - _lt_linker_boilerplate=`cat conftest.err` --$rm conftest* -+$rm -r conftest* - - - # Allow CC to be a program name with arguments. -@@ -19800,6 +19902,7 @@ if test -f "$ltmain"; then - predeps_RC \ - postdeps_RC \ - compiler_lib_search_path_RC \ -+ compiler_lib_search_dirs_RC \ - archive_cmds_RC \ - archive_expsym_cmds_RC \ - postinstall_cmds_RC \ -@@ -19815,6 +19918,7 @@ if test -f "$ltmain"; then - module_cmds_RC \ - module_expsym_cmds_RC \ - lt_cv_prog_compiler_c_o_RC \ -+ fix_srcfile_path_RC \ - exclude_expsyms_RC \ - include_expsyms_RC; do - -@@ -20047,6 +20151,10 @@ predeps=$lt_predeps_RC - # shared library. - postdeps=$lt_postdeps_RC - -+# The directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC -+ - # The library search path used internally by the compiler when linking - # a shared library. - compiler_lib_search_path=$lt_compiler_lib_search_path_RC -@@ -20135,7 +20243,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea - sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - - # Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path="$fix_srcfile_path_RC" -+fix_srcfile_path=$lt_fix_srcfile_path - - # Set to yes if exported symbols are required. - always_export_symbols=$always_export_symbols_RC -@@ -20254,7 +20362,7 @@ 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -+ 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 -@@ -20276,9 +20384,7 @@ echo "${ECHO_T}no" >&6; } - fi - - -- -- --if $HAVE_DOXYGEN; then -+ if $HAVE_DOXYGEN; then - HAVE_DOXYGEN_TRUE= - HAVE_DOXYGEN_FALSE='#' - else -@@ -20307,7 +20413,7 @@ 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -+ 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_PDFLATEX="yes" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -20344,7 +20450,7 @@ 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -+ 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_BIBTEX="yes" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -20381,7 +20487,7 @@ 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -+ 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_TRANSFIG="yes" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -20439,9 +20545,7 @@ echo "${ECHO_T}no" >&6; } - fi - fi - fi -- -- --if $BUILD_SPEC; then -+ if $BUILD_SPEC; then - BUILD_SPEC_TRUE= - BUILD_SPEC_FALSE='#' - else -@@ -20485,7 +20589,7 @@ 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -+ 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 -@@ -20609,9 +20713,7 @@ _ACEOF - else - cpu_optimization="disabled" - fi -- -- --if test x$cpu_x86_64 = xyes; then -+ if test x$cpu_x86_64 = xyes; then - CPU_x86_64_TRUE= - CPU_x86_64_FALSE='#' - else -@@ -20619,9 +20721,7 @@ else - CPU_x86_64_FALSE= - fi - -- -- --if test x$cpu_x86_32 = xyes; then -+ if test x$cpu_x86_32 = xyes; then - CPU_x86_32_TRUE= - CPU_x86_32_FALSE='#' - else -@@ -20629,9 +20729,7 @@ else - CPU_x86_32_FALSE= - fi - -- -- --if test x$ac_enable_asm = xyes; then -+ if test x$ac_enable_asm = xyes; then - OC_X86ASM_TRUE= - OC_X86ASM_FALSE='#' - else -@@ -20811,48 +20909,40 @@ THEORA_LDFLAGS="$THEORA_LDFLAGS $TH_VERS - - - --HAVE_OGG=no - - --# 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_executable_p "$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 - -+{ echo "$as_me:$LINENO: checking for ogg" >&5 -+echo $ECHO_N "checking for ogg... $ECHO_C" >&6; } -+# Check whether --enable-ogg was given. -+if test "${enable_ogg+set}" = set; then -+ enableval=$enable_ogg; case "$enableval" in -+ y | yes) HAVE_OGG=yes ;; -+ *) HAVE_OGG=no ;; -+ esac -+else -+ HAVE_OGG=yes - 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; } -+ -+{ echo "$as_me:$LINENO: result: ${HAVE_OGG}" >&5 -+echo "${ECHO_T}${HAVE_OGG}" >&6; } -+ if test "$HAVE_OGG" = "yes"; then -+ HAVE_OGG_TRUE= -+ HAVE_OGG_FALSE='#' - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ HAVE_OGG_TRUE='#' -+ HAVE_OGG_FALSE= - fi - -+if test "${HAVE_OGG}" = "yes"; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_OGG 1 -+_ACEOF -+ -+ -+ REQUIRES_OGG="ogg >= 1.1" - --if test "x$HAVE_PKG_CONFIG" = "xyes" --then - - succeeded=no - -@@ -20875,7 +20965,7 @@ 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -+ 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 -@@ -20908,23 +20998,23 @@ fi - else - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then -- { echo "$as_me:$LINENO: checking for ogg >= 1.1" >&5 --echo $ECHO_N "checking for ogg >= 1.1... $ECHO_C" >&6; } -+ { echo "$as_me:$LINENO: checking for ${REQUIRES_OGG}" >&5 -+echo $ECHO_N "checking for ${REQUIRES_OGG}... $ECHO_C" >&6; } - -- if $PKG_CONFIG --exists "ogg >= 1.1" ; then -+ if $PKG_CONFIG --exists "${REQUIRES_OGG}" ; then - { echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6; } - succeeded=yes - - { echo "$as_me:$LINENO: checking OGG_CFLAGS" >&5 - echo $ECHO_N "checking OGG_CFLAGS... $ECHO_C" >&6; } -- OGG_CFLAGS=`$PKG_CONFIG --cflags "ogg >= 1.1"` -+ OGG_CFLAGS=`$PKG_CONFIG --cflags "${REQUIRES_OGG}"` - { echo "$as_me:$LINENO: result: $OGG_CFLAGS" >&5 - echo "${ECHO_T}$OGG_CFLAGS" >&6; } - - { echo "$as_me:$LINENO: checking OGG_LIBS" >&5 - echo $ECHO_N "checking OGG_LIBS... $ECHO_C" >&6; } -- OGG_LIBS=`$PKG_CONFIG --libs "ogg >= 1.1"` -+ OGG_LIBS=`$PKG_CONFIG --libs "${REQUIRES_OGG}"` - { echo "$as_me:$LINENO: result: $OGG_LIBS" >&5 - echo "${ECHO_T}$OGG_LIBS" >&6; } - else -@@ -20932,7 +21022,7 @@ echo "${ECHO_T}$OGG_LIBS" >&6; } - OGG_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. -- OGG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ogg >= 1.1"` -+ OGG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "${REQUIRES_OGG}"` - - fi - -@@ -20945,417 +21035,80 @@ echo "${ECHO_T}$OGG_LIBS" >&6; } - fi - - if test $succeeded = yes; then -- HAVE_OGG=yes -+ : - else -- HAVE_OGG=no -- fi -+ { { echo "$as_me:$LINENO: error: *** ${REQUIRES_OGG} not found by pkg-config on your system" >&5 -+echo "$as_me: error: *** ${REQUIRES_OGG} not found by pkg-config on your system" >&2;} -+ { (exit 1); exit 1; }; } - --fi --if test "x$HAVE_OGG" = "xno" --then -+ fi - --# 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" -+{ echo "$as_me:$LINENO: checking for vorbis" >&5 -+echo $ECHO_N "checking for vorbis... $ECHO_C" >&6; } -+# Check whether --enable-vorbis was given. -+if test "${enable_vorbis+set}" = set; then -+ enableval=$enable_vorbis; case "$enableval" in -+ y | yes) HAVE_VORBIS=yes ;; -+ *) HAVE_VORBIS=no ;; -+ esac - else -- ogg_includes="" -+ HAVE_VORBIS=yes - fi - --# Check whether --enable-oggtest was given. --if test "${enable_oggtest+set}" = set; then -- enableval=$enable_oggtest; -+{ echo "$as_me:$LINENO: result: ${HAVE_VORBIS}" >&5 -+echo "${ECHO_T}${HAVE_VORBIS}" >&6; } -+ if test "$HAVE_VORBIS" = "yes"; then -+ HAVE_VORBIS_TRUE= -+ HAVE_VORBIS_FALSE='#' - else -- enable_oggtest=yes -+ HAVE_VORBIS_TRUE='#' -+ HAVE_VORBIS_FALSE= - fi - -+if test "${HAVE_VORBIS}" = "yes"; then - -- 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$libdir" -- fi -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_VORBIS 1 -+_ACEOF - -- 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="" -- fi -+ REQUIRES_VORBIS="vorbis >= 1.0.1" - -- { 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 - -+ succeeded=no - -- 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" -+ if test -z "$PKG_CONFIG"; then -+ # 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_PKG_CONFIG+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 <stdio.h> --#include <stdlib.h> --#include <string.h> --#include <ogg/ogg.h> -- --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 -- -- -- CFLAGS="$ac_save_CFLAGS" -- LIBS="$ac_save_LIBS" -- fi -- -- if test "x$no_ogg" = "xdisabled" ; then -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -- { { echo "$as_me:$LINENO: error: -- libogg is required to build this package! -- please see http://www.xiph.org/ for how to -- obtain a copy. -- " >&5 --echo "$as_me: error: -- libogg is required to build this package! -- please see http://www.xiph.org/ for how to -- obtain a copy. -- " >&2;} -- { (exit 1); exit 1; }; } -- elif test "x$no_ogg" = "x" ; 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; } -- 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. */ -- --#include <stdio.h> --#include <ogg/ogg.h> -- --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); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -- 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="" -- { { echo "$as_me:$LINENO: error: -- libogg is required to build this package! -- please see http://www.xiph.org/ for how to -- obtain a copy. -- " >&5 --echo "$as_me: error: -- libogg is required to build this package! -- please see http://www.xiph.org/ for how to -- obtain a copy. -- " >&2;} -- { (exit 1); exit 1; }; } -- fi -- -- -- rm -f conf.oggtest -- -- cflags_save=$CFLAGS -- libs_save=$LIBS -- CFLAGS="$CFLAGS $OGG_CFLAGS" -- LIBS="$LIBS $OGG_LIBS" -- { echo "$as_me:$LINENO: checking for oggpackB_read" >&5 --echo $ECHO_N "checking for oggpackB_read... $ECHO_C" >&6; } --if test "${ac_cv_func_oggpackB_read+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 oggpackB_read to an innocuous variant, in case <limits.h> declares oggpackB_read. -- For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define oggpackB_read innocuous_oggpackB_read -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char oggpackB_read (); below. -- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- <limits.h> exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- --#undef oggpackB_read -- --/* 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 oggpackB_read (); --/* 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_oggpackB_read || defined __stub___oggpackB_read --choke me --#endif -- --int --main () --{ --return oggpackB_read (); -- ; -- 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); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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_func_oggpackB_read=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_func_oggpackB_read=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_oggpackB_read" >&5 --echo "${ECHO_T}$ac_cv_func_oggpackB_read" >&6; } --if test $ac_cv_func_oggpackB_read = yes; then -- : --else -- -- { { echo "$as_me:$LINENO: error: newer libogg version (1.1 or later) required" >&5 --echo "$as_me: error: newer libogg version (1.1 or later) required" >&2;} -- { (exit 1); exit 1; }; } -- --fi -- -- CFLAGS=$cflags_save -- LIBS=$libs_save --fi -- -- --HAVE_VORBIS=no -- -- --if test "x$HAVE_PKG_CONFIG" = "xyes" --then -- -- succeeded=no -- -- if test -z "$PKG_CONFIG"; then -- # 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_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_executable_p "$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 -+ 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 - - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" - ;; -@@ -21381,342 +21134,101 @@ fi - else - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then -- { echo "$as_me:$LINENO: checking for vorbis >= 1.0.1" >&5 --echo $ECHO_N "checking for vorbis >= 1.0.1... $ECHO_C" >&6; } -+ { echo "$as_me:$LINENO: checking for ${REQUIRES_VORBIS}" >&5 -+echo $ECHO_N "checking for ${REQUIRES_VORBIS}... $ECHO_C" >&6; } - -- if $PKG_CONFIG --exists "vorbis >= 1.0.1" ; then -+ if $PKG_CONFIG --exists "${REQUIRES_VORBIS}" ; then - { echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6; } - succeeded=yes - - { echo "$as_me:$LINENO: checking VORBIS_CFLAGS" >&5 - echo $ECHO_N "checking VORBIS_CFLAGS... $ECHO_C" >&6; } -- VORBIS_CFLAGS=`$PKG_CONFIG --cflags "vorbis >= 1.0.1"` -+ VORBIS_CFLAGS=`$PKG_CONFIG --cflags "${REQUIRES_VORBIS}"` - { echo "$as_me:$LINENO: result: $VORBIS_CFLAGS" >&5 - echo "${ECHO_T}$VORBIS_CFLAGS" >&6; } - - { echo "$as_me:$LINENO: checking VORBIS_LIBS" >&5 - echo $ECHO_N "checking VORBIS_LIBS... $ECHO_C" >&6; } -- VORBIS_LIBS=`$PKG_CONFIG --libs "vorbis >= 1.0.1"` -+ VORBIS_LIBS=`$PKG_CONFIG --libs "${REQUIRES_VORBIS}"` - { echo "$as_me:$LINENO: result: $VORBIS_LIBS" >&5 --echo "${ECHO_T}$VORBIS_LIBS" >&6; } -- else -- VORBIS_CFLAGS="" -- VORBIS_LIBS="" -- ## If we have a custom action on failure, don't print errors, but -- ## do set a variable so people can do so. -- VORBIS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "vorbis >= 1.0.1"` -- -- fi -- -- -- -- else -- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." -- echo "*** See http://www.freedesktop.org/software/pkgconfig" -- fi -- fi -- -- if test $succeeded = yes; then -- HAVE_VORBIS=yes -- else -- HAVE_VORBIS=no -- fi -- -- VORBISENC_LIBS="-lvorbisenc" -- --fi --if test "x$HAVE_VORBIS" = "xno" --then -- --# Check whether --with-vorbis was given. --if test "${with_vorbis+set}" = set; then -- withval=$with_vorbis; vorbis_prefix="$withval" --else -- vorbis_prefix="" --fi -- -- --# Check whether --with-vorbis-libraries was given. --if test "${with_vorbis_libraries+set}" = set; then -- withval=$with_vorbis_libraries; vorbis_libraries="$withval" --else -- vorbis_libraries="" --fi -- -- --# Check whether --with-vorbis-includes was given. --if test "${with_vorbis_includes+set}" = set; then -- withval=$with_vorbis_includes; vorbis_includes="$withval" --else -- vorbis_includes="" --fi -- --# Check whether --enable-vorbistest was given. --if test "${enable_vorbistest+set}" = set; then -- enableval=$enable_vorbistest; --else -- enable_vorbistest=yes --fi -- -- -- if test "x$vorbis_libraries" != "x" ; then -- VORBIS_LIBS="-L$vorbis_libraries" -- elif test "x$vorbis_prefix" != "x" ; then -- VORBIS_LIBS="-L$vorbis_prefix/lib" -- elif test "x$prefix" != "xNONE"; then -- VORBIS_LIBS="-L$libdir" -- fi -- -- VORBIS_LIBS="$VORBIS_LIBS -lvorbis -lm" -- VORBISFILE_LIBS="-lvorbisfile" -- VORBISENC_LIBS="-lvorbisenc" -- -- if test "x$vorbis_includes" != "x" ; then -- VORBIS_CFLAGS="-I$vorbis_includes" -- elif test "x$vorbis_prefix" != "x" ; then -- VORBIS_CFLAGS="-I$vorbis_prefix/include" -- elif test "x$prefix" != "xNONE"; then -- VORBIS_CFLAGS="" -- fi -- -- -- { echo "$as_me:$LINENO: checking for Vorbis" >&5 --echo $ECHO_N "checking for Vorbis... $ECHO_C" >&6; } -- no_vorbis="" -- -- -- if test "x$enable_vorbistest" = "xyes" ; then -- ac_save_CFLAGS="$CFLAGS" -- ac_save_LIBS="$LIBS" -- CFLAGS="$CFLAGS $VORBIS_CFLAGS $OGG_CFLAGS" -- LIBS="$LIBS $VORBIS_LIBS $VORBISENC_LIBS $OGG_LIBS" -- rm -f conf.vorbistest -- 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 <stdio.h> --#include <stdlib.h> --#include <string.h> --#include <vorbis/codec.h> --#include <vorbis/vorbisenc.h> -- --int main () --{ -- vorbis_block vb; -- vorbis_dsp_state vd; -- vorbis_info vi; -- -- vorbis_info_init (&vi); -- vorbis_encode_init (&vi, 2, 44100, -1, 128000, -1); -- vorbis_analysis_init (&vd, &vi); -- vorbis_block_init (&vd, &vb); -- /* this function was added in 1.0rc3, so this is what we're testing for */ -- vorbis_bitrate_addblock (&vb); -- -- system("touch conf.vorbistest"); -- 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_vorbis=yes --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext --fi -- -- -- CFLAGS="$ac_save_CFLAGS" -- LIBS="$ac_save_LIBS" -- fi -- -- if test "x$no_vorbis" = "x" ; then -- { echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -- HAVE_VORBIS=yes -- else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -- if test -f conf.vorbistest ; then -- : -- else -- echo "*** Could not run Vorbis test program, checking why..." -- CFLAGS="$CFLAGS $VORBIS_CFLAGS" -- LIBS="$LIBS $VORBIS_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 <stdio.h> --#include <vorbis/codec.h> -- --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); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -- echo "*** The test program compiled, but did not run. This usually means" -- echo "*** that the run-time linker is not finding Vorbis or finding the wrong" -- echo "*** version of Vorbis. If it is not finding Vorbis, 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 "${ECHO_T}$VORBIS_LIBS" >&6; } -+ else -+ VORBIS_CFLAGS="" -+ VORBIS_LIBS="" -+ ## If we have a custom action on failure, don't print errors, but -+ ## do set a variable so people can do so. -+ VORBIS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "${REQUIRES_VORBIS}"` - -- echo "*** The test program failed to compile or link. See the file config.log for the" -- echo "*** exact error that occured. This usually means Vorbis was incorrectly installed" -- echo "*** or that you have moved Vorbis since it was installed." --fi -+ 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" -+ -+ -+ else -+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." -+ echo "*** See http://www.freedesktop.org/software/pkgconfig" - fi -- VORBIS_CFLAGS="" -- VORBIS_LIBS="" -- VORBISFILE_LIBS="" -- VORBISENC_LIBS="" -- HAVE_VORBIS=no - fi - -+ if test $succeeded = yes; then -+ : -+ else -+ { { echo "$as_me:$LINENO: error: *** ${REQUIRES_VORBIS} not found by pkg-config on your system" >&5 -+echo "$as_me: error: *** ${REQUIRES_VORBIS} not found by pkg-config on your system" >&2;} -+ { (exit 1); exit 1; }; } - -+ fi - - -- rm -f conf.vorbistest - - fi - --HAVE_SDL=no - -- --# Check whether --with-sdl-prefix was given. --if test "${with_sdl_prefix+set}" = set; then -- withval=$with_sdl_prefix; sdl_prefix="$withval" -+{ echo "$as_me:$LINENO: checking for sdl" >&5 -+echo $ECHO_N "checking for sdl... $ECHO_C" >&6; } -+# Check whether --enable-sdl was given. -+if test "${enable_sdl+set}" = set; then -+ enableval=$enable_sdl; case "$enableval" in -+ y | yes) HAVE_SDL=yes ;; -+ *) HAVE_SDL=no ;; -+ esac - else -- sdl_prefix="" -+ HAVE_SDL=yes - fi - -- --# Check whether --with-sdl-exec-prefix was given. --if test "${with_sdl_exec_prefix+set}" = set; then -- withval=$with_sdl_exec_prefix; sdl_exec_prefix="$withval" -+{ echo "$as_me:$LINENO: result: ${HAVE_SDL}" >&5 -+echo "${ECHO_T}${HAVE_SDL}" >&6; } -+ if test "$HAVE_SDL" = "yes"; then -+ HAVE_SDL_TRUE= -+ HAVE_SDL_FALSE='#' - else -- sdl_exec_prefix="" -+ HAVE_SDL_TRUE='#' -+ HAVE_SDL_FALSE= - fi - --# Check whether --enable-sdltest was given. --if test "${enable_sdltest+set}" = set; then -- enableval=$enable_sdltest; --else -- enable_sdltest=yes --fi -+if test "${HAVE_SDL}" = "yes"; then - -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_SDL 1 -+_ACEOF - -- if test x$sdl_exec_prefix != x ; then -- sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix" -- if test x${SDL_CONFIG+set} != xset ; then -- SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config -- fi -- fi -- if test x$sdl_prefix != x ; then -- sdl_args="$sdl_args --prefix=$sdl_prefix" -- if test x${SDL_CONFIG+set} != xset ; then -- SDL_CONFIG=$sdl_prefix/bin/sdl-config -- fi -- fi - -+ REQUIRES_SDL="sdl >= 1.2.13" - -- PATH="$prefix/bin:$prefix/usr/bin:$PATH" -- # Extract the first word of "sdl-config", so it can be a program name with args. --set dummy sdl-config; ac_word=$2 -+ -+ succeeded=no -+ -+ if test -z "$PKG_CONFIG"; then -+ # 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_SDL_CONFIG+set}" = set; then -+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- case $SDL_CONFIG in -+ case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) -- ac_cv_path_SDL_CONFIG="$SDL_CONFIG" # Let the user override the test with a path. -+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -@@ -21725,8 +21237,8 @@ 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext" -+ 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 -@@ -21734,265 +21246,79 @@ done - done - IFS=$as_save_IFS - -- test -z "$ac_cv_path_SDL_CONFIG" && ac_cv_path_SDL_CONFIG="no" -+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" - ;; - esac - fi --SDL_CONFIG=$ac_cv_path_SDL_CONFIG --if test -n "$SDL_CONFIG"; then -- { echo "$as_me:$LINENO: result: $SDL_CONFIG" >&5 --echo "${ECHO_T}$SDL_CONFIG" >&6; } -+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 - - -- min_sdl_version=0.11.0 -- { echo "$as_me:$LINENO: checking for SDL - version >= $min_sdl_version" >&5 --echo $ECHO_N "checking for SDL - version >= $min_sdl_version... $ECHO_C" >&6; } -- no_sdl="" -- if test "$SDL_CONFIG" = "no" ; then -- no_sdl=yes -- else -- SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags` -- SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs` -- -- sdl_major_version=`$SDL_CONFIG $sdl_args --version | \ -- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` -- sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \ -- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` -- sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ -- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` -- if test "x$enable_sdltest" = "xyes" ; then -- ac_save_CFLAGS="$CFLAGS" -- ac_save_CXXFLAGS="$CXXFLAGS" -- ac_save_LIBS="$LIBS" -- CFLAGS="$CFLAGS $SDL_CFLAGS" -- CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" -- LIBS="$LIBS $SDL_LIBS" -- rm -f conf.sdltest -- 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 <stdio.h> --#include <stdlib.h> --#include <string.h> --#include "SDL.h" -- --char* --my_strdup (char *str) --{ -- char *new_str; -+ fi - -- if (str) -- { -- new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); -- strcpy (new_str, str); -- } -+ if test "$PKG_CONFIG" = "no" ; then -+ echo "*** The pkg-config script could not be found. Make sure it is" -+ echo "*** in your path, or set the PKG_CONFIG environment variable" -+ echo "*** to the full path to pkg-config." -+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." - else -- new_str = NULL; -- -- return new_str; --} -- --int main (int argc, char *argv[]) --{ -- int major, minor, micro; -- char *tmp_version; -+ PKG_CONFIG_MIN_VERSION=0.9.0 -+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then -+ { echo "$as_me:$LINENO: checking for ${REQUIRES_SDL}" >&5 -+echo $ECHO_N "checking for ${REQUIRES_SDL}... $ECHO_C" >&6; } - -- /* This hangs on some systems (?) -- system ("touch conf.sdltest"); -- */ -- { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } -- -- /* HP/UX 9 (%@#!) writes to sscanf strings */ -- tmp_version = my_strdup("$min_sdl_version"); -- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -- printf("%s, bad version string\n", "$min_sdl_version"); -- exit(1); -- } -- -- if (($sdl_major_version > major) || -- (($sdl_major_version == major) && ($sdl_minor_version > minor)) || -- (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro))) -- { -- return 0; -- } -- else -- { -- printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version); -- printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro); -- printf("*** best to upgrade to the required version.\n"); -- printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n"); -- printf("*** to point to the correct copy of sdl-config, and remove the file\n"); -- printf("*** config.cache before re-running configure\n"); -- return 1; -- } --} -+ if $PKG_CONFIG --exists "${REQUIRES_SDL}" ; then -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } -+ succeeded=yes - -+ { echo "$as_me:$LINENO: checking SDL_CFLAGS" >&5 -+echo $ECHO_N "checking SDL_CFLAGS... $ECHO_C" >&6; } -+ SDL_CFLAGS=`$PKG_CONFIG --cflags "${REQUIRES_SDL}"` -+ { echo "$as_me:$LINENO: result: $SDL_CFLAGS" >&5 -+echo "${ECHO_T}$SDL_CFLAGS" >&6; } -+ -+ { echo "$as_me:$LINENO: checking SDL_LIBS" >&5 -+echo $ECHO_N "checking SDL_LIBS... $ECHO_C" >&6; } -+ SDL_LIBS=`$PKG_CONFIG --libs "${REQUIRES_SDL}"` -+ { echo "$as_me:$LINENO: result: $SDL_LIBS" >&5 -+echo "${ECHO_T}$SDL_LIBS" >&6; } -+ else -+ SDL_CFLAGS="" -+ SDL_LIBS="" -+ ## If we have a custom action on failure, don't print errors, but -+ ## do set a variable so people can do so. -+ SDL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "${REQUIRES_SDL}"` - --_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 -+ fi - --( exit $ac_status ) --no_sdl=yes --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext --fi - - -- CFLAGS="$ac_save_CFLAGS" -- CXXFLAGS="$ac_save_CXXFLAGS" -- LIBS="$ac_save_LIBS" -+ else -+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." -+ echo "*** See http://www.freedesktop.org/software/pkgconfig" - fi - fi -- if test "x$no_sdl" = x ; then -- { echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -- -- HAVE_SDL=yes -- SDL_LIBS=`$SDL_CONFIG --libs` - -+ if test $succeeded = yes; then -+ : - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -- if test "$SDL_CONFIG" = "no" ; then -- echo "*** The sdl-config script installed by SDL could not be found" -- echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" -- echo "*** your path, or set the SDL_CONFIG environment variable to the" -- echo "*** full path to sdl-config." -- else -- if test -f conf.sdltest ; then -- : -- else -- echo "*** Could not run SDL test program, checking why..." -- CFLAGS="$CFLAGS $SDL_CFLAGS" -- CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" -- LIBS="$LIBS $SDL_LIBS" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+ { { echo "$as_me:$LINENO: error: *** ${REQUIRES_SDL} not found by pkg-config on your system" >&5 -+echo "$as_me: error: *** ${REQUIRES_SDL} not found by pkg-config on your system" >&2;} -+ { (exit 1); exit 1; }; } - --#include <stdio.h> --#include "SDL.h" -+ fi - --int main(int argc, char *argv[]) --{ return 0; } --#undef main --#define main K_and_R_C_main - --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); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -- echo "*** The test program compiled, but did not run. This usually means" -- echo "*** that the run-time linker is not finding SDL or finding the wrong" -- echo "*** version of SDL. If it is not finding SDL, 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 SDL was incorrectly installed" -- echo "*** or that you have moved SDL since it was installed. In the latter case, you" -- echo "*** may want to edit the sdl-config script: $SDL_CONFIG" - fi - --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext -- CFLAGS="$ac_save_CFLAGS" -- CXXFLAGS="$ac_save_CXXFLAGS" -- LIBS="$ac_save_LIBS" -- fi -- fi -- SDL_CFLAGS="" -- SDL_LIBS="" -- { echo "$as_me:$LINENO: WARNING: *** Unable to find SDL -- Not compiling example players ***" >&5 --echo "$as_me: WARNING: *** Unable to find SDL -- Not compiling example players ***" >&2;} -- fi -- -- -- rm -f conf.sdltest -- - - HAVE_OSS=no - -@@ -22037,27 +21363,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (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 -@@ -22093,17 +21402,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (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 -@@ -22195,7 +21497,7 @@ 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then -+ 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 -@@ -22292,9 +21594,7 @@ cat >>confdefs.h <<\_ACEOF - _ACEOF - - fi -- -- --if test "x${ac_enable_float}" != xyes; then -+ if test "x${ac_enable_float}" != xyes; then - THEORA_DISABLE_FLOAT_TRUE= - THEORA_DISABLE_FLOAT_FALSE='#' - else -@@ -22327,9 +21627,7 @@ else - echo "$as_me: Vorbis missing, cannot build example encoder" >&6;} - fi - fi -- -- --if test "x${ac_enable_encode}" != xyes; then -+ if test "x${ac_enable_encode}" != xyes; then - THEORA_DISABLE_ENCODE_TRUE= - THEORA_DISABLE_ENCODE_FALSE='#' - else -@@ -22347,9 +21645,7 @@ else - ac_enable_examples=yes - fi - -- -- --if test "x${ac_enable_examples}" != xno; then -+ if test "x${ac_enable_examples}" != xno; then - THEORA_ENABLE_EXAMPLES_TRUE= - THEORA_ENABLE_EXAMPLES_FALSE='#' - else -@@ -22426,27 +21722,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (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 - else - echo "$as_me: failed program was:" >&5 -@@ -22641,6 +21921,27 @@ echo "$as_me: error: conditional \"OC_X8 - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - 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; }; } -+fi -+if test -z "${HAVE_VORBIS_TRUE}" && test -z "${HAVE_VORBIS_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_VORBIS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"HAVE_VORBIS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${HAVE_SDL_TRUE}" && test -z "${HAVE_SDL_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_SDL\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"HAVE_SDL\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi - if test -z "${THEORA_DISABLE_FLOAT_TRUE}" && test -z "${THEORA_DISABLE_FLOAT_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"THEORA_DISABLE_FLOAT\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 -@@ -22686,7 +21987,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF - ## M4sh Initialization. ## - ## --------------------- ## - --# Be Bourne compatible -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -@@ -22695,10 +21997,13 @@ if test -n "${ZSH_VERSION+set}" && (emul - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST - else -- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ - fi --BIN_SH=xpg4; export BIN_SH # for Tru64 --DUALCASE=1; export DUALCASE # for MKS sh -+ -+ - - - # PATH needs CR -@@ -22922,19 +22227,28 @@ else - as_mkdir_p=false - fi - --# Find out whether ``test -x'' works. Don't use a zero-byte file, as --# systems may use methods other than mode bits to determine executability. --cat >conf$$.file <<_ASEOF --#! /bin/sh --exit 0 --_ASEOF --chmod +x conf$$.file --if test -x conf$$.file >/dev/null 2>&1; then -- as_executable_p="test -x" -+if test -x / >/dev/null 2>&1; then -+ as_test_x='test -x' - else -- as_executable_p=: -+ 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 --rm -f conf$$.file -+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'" -@@ -22950,7 +22264,7 @@ exec 6>&1 - # values after options handling. - ac_log=" - This file was extended by libtheora $as_me 1.0, which was --generated by GNU Autoconf 2.60a. Invocation command line was -+generated by GNU Autoconf 2.61. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -23003,7 +22317,7 @@ _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF - ac_cs_version="\\ - libtheora config.status 1.0 --configured by $0, generated by GNU Autoconf 2.60a, -+configured by $0, generated by GNU Autoconf 2.61, - with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" - - Copyright (C) 2006 Free Software Foundation, Inc. -@@ -23013,6 +22327,7 @@ gives unlimited permission to copy, dist - ac_pwd='$ac_pwd' - srcdir='$srcdir' - INSTALL='$INSTALL' -+MKDIR_P='$MKDIR_P' - _ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF -@@ -23248,6 +22563,7 @@ 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 -@@ -23292,7 +22608,6 @@ 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 - _ACEOF - - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then -@@ -23334,14 +22649,18 @@ _ACEOF - ac_delim='%!_!# ' - for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim - am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim - CPP!$CPP$ac_delim -+SED!$SED$ac_delim - GREP!$GREP$ac_delim - EGREP!$EGREP$ac_delim - LN_S!$LN_S$ac_delim - ECHO!$ECHO$ac_delim - AR!$AR$ac_delim - RANLIB!$RANLIB$ac_delim -+DSYMUTIL!$DSYMUTIL$ac_delim -+NMEDIT!$NMEDIT$ac_delim - DLLTOOL!$DLLTOOL$ac_delim - AS!$AS$ac_delim - OBJDUMP!$OBJDUMP$ac_delim -@@ -23376,15 +22695,20 @@ OC_X86ASM_FALSE!$OC_X86ASM_FALSE$ac_deli - THEORADEC_LDFLAGS!$THEORADEC_LDFLAGS$ac_delim - THEORAENC_LDFLAGS!$THEORAENC_LDFLAGS$ac_delim - THEORA_LDFLAGS!$THEORA_LDFLAGS$ac_delim --HAVE_PKG_CONFIG!$HAVE_PKG_CONFIG$ac_delim -+HAVE_OGG_TRUE!$HAVE_OGG_TRUE$ac_delim -+HAVE_OGG_FALSE!$HAVE_OGG_FALSE$ac_delim -+REQUIRES_OGG!$REQUIRES_OGG$ac_delim - PKG_CONFIG!$PKG_CONFIG$ac_delim - OGG_CFLAGS!$OGG_CFLAGS$ac_delim - OGG_LIBS!$OGG_LIBS$ac_delim -+HAVE_VORBIS_TRUE!$HAVE_VORBIS_TRUE$ac_delim -+HAVE_VORBIS_FALSE!$HAVE_VORBIS_FALSE$ac_delim -+REQUIRES_VORBIS!$REQUIRES_VORBIS$ac_delim - VORBIS_CFLAGS!$VORBIS_CFLAGS$ac_delim - VORBIS_LIBS!$VORBIS_LIBS$ac_delim --VORBISENC_LIBS!$VORBISENC_LIBS$ac_delim --VORBISFILE_LIBS!$VORBISFILE_LIBS$ac_delim --SDL_CONFIG!$SDL_CONFIG$ac_delim -+HAVE_SDL_TRUE!$HAVE_SDL_TRUE$ac_delim -+HAVE_SDL_FALSE!$HAVE_SDL_FALSE$ac_delim -+REQUIRES_SDL!$REQUIRES_SDL$ac_delim - SDL_CFLAGS!$SDL_CFLAGS$ac_delim - SDL_LIBS!$SDL_LIBS$ac_delim - PNG_CFLAGS!$PNG_CFLAGS$ac_delim -@@ -23403,7 +22727,7 @@ LIBOBJS!$LIBOBJS$ac_delim - LTLIBOBJS!$LTLIBOBJS$ac_delim - _ACEOF - -- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 67; then -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -@@ -23630,6 +22954,11 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_ - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; - esac -+ ac_MKDIR_P=$MKDIR_P -+ case $MKDIR_P in -+ [\\/$]* | ?:[\\/]* ) ;; -+ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; -+ esac - _ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF -@@ -23683,6 +23012,7 @@ s&@builddir@&$ac_builddir&;t t - s&@abs_builddir@&$ac_abs_builddir&;t t - s&@abs_top_builddir@&$ac_abs_top_builddir&;t t - 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 - -@@ -23798,21 +23128,22 @@ echo "$as_me: $ac_file is unchanged" >&6 - fi - rm -f "$tmp/out12" - # 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 -- $ac_file | $ac_file:* ) -+ $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac - done --echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || --$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X$ac_file : 'X\(//\)[^/]' \| \ -- X$ac_file : 'X\(//\)$' \| \ -- X$ac_file : 'X\(/\)' \| . 2>/dev/null || --echo X$ac_file | -+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || -+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$_am_arg" : 'X\(//\)[^/]' \| \ -+ X"$_am_arg" : 'X\(//\)$' \| \ -+ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -+echo X"$_am_arg" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q -@@ -23847,8 +23178,9 @@ echo "$as_me: executing $ac_file command - # 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. -- # So let's grep whole file. -- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then -+ # 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\(//\)[^/]' \| \ -Index: libtheora-1.0/doc/Makefile.in -=================================================================== ---- libtheora-1.0.orig/doc/Makefile.in -+++ libtheora-1.0/doc/Makefile.in -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.9.6 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 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. -@@ -14,15 +14,11 @@ - - @SET_MAKE@ - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -42,9 +38,7 @@ DIST_COMMON = $(srcdir)/Doxyfile.in $(sr - $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ -- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/pkg.m4 \ -- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/vorbis.m4 \ -- $(top_srcdir)/configure.ac -+ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(install_sh) -d -@@ -54,10 +48,11 @@ SOURCES = - DIST_SOURCES = - RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ -- install-exec-recursive install-info-recursive \ -- install-recursive installcheck-recursive installdirs-recursive \ -- pdf-recursive ps-recursive uninstall-info-recursive \ -- uninstall-recursive -+ install-dvi-recursive install-exec-recursive \ -+ install-html-recursive install-info-recursive \ -+ install-pdf-recursive install-ps-recursive install-recursive \ -+ installcheck-recursive installdirs-recursive pdf-recursive \ -+ ps-recursive uninstall-recursive - am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; - am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -@@ -67,14 +62,14 @@ am__strip_dir = `echo $$p | sed -e 's|^. - am__installdirs = "$(DESTDIR)$(docdir)" - docDATA_INSTALL = $(INSTALL_DATA) - DATA = $(doc_DATA) -+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ -+ distclean-recursive maintainer-clean-recursive - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -84,17 +79,11 @@ AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ - BINDIR = @BINDIR@ - BUILDABLE_EXAMPLES = @BUILDABLE_EXAMPLES@ --BUILD_SPEC_FALSE = @BUILD_SPEC_FALSE@ --BUILD_SPEC_TRUE = @BUILD_SPEC_TRUE@ - CC = @CC@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CPU_x86_32_FALSE = @CPU_x86_32_FALSE@ --CPU_x86_32_TRUE = @CPU_x86_32_TRUE@ --CPU_x86_64_FALSE = @CPU_x86_64_FALSE@ --CPU_x86_64_TRUE = @CPU_x86_64_TRUE@ - CXX = @CXX@ - CXXCPP = @CXXCPP@ - CXXDEPMODE = @CXXDEPMODE@ -@@ -105,6 +94,7 @@ DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DOCDIR = @DOCDIR@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -117,13 +107,11 @@ GETOPT_OBJS = @GETOPT_OBJS@ - GREP = @GREP@ - HAVE_BIBTEX = @HAVE_BIBTEX@ - HAVE_DOXYGEN = @HAVE_DOXYGEN@ --HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ --HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ - HAVE_PDFLATEX = @HAVE_PDFLATEX@ --HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ - HAVE_TRANSFIG = @HAVE_TRANSFIG@ - HAVE_VALGRIND = @HAVE_VALGRIND@ - INCLUDEDIR = @INCLUDEDIR@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -136,13 +124,11 @@ LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OC_X86ASM_FALSE = @OC_X86ASM_FALSE@ --OC_X86ASM_TRUE = @OC_X86ASM_TRUE@ - OGG_CFLAGS = @OGG_CFLAGS@ - OGG_LIBS = @OGG_LIBS@ - PACKAGE = @PACKAGE@ -@@ -157,9 +143,12 @@ PNG_CFLAGS = @PNG_CFLAGS@ - PNG_LIBS = @PNG_LIBS@ - PROFILE = @PROFILE@ - RANLIB = @RANLIB@ -+REQUIRES_OGG = @REQUIRES_OGG@ -+REQUIRES_SDL = @REQUIRES_SDL@ -+REQUIRES_VORBIS = @REQUIRES_VORBIS@ - SDL_CFLAGS = @SDL_CFLAGS@ --SDL_CONFIG = @SDL_CONFIG@ - SDL_LIBS = @SDL_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -171,29 +160,21 @@ THENC_LIB_CURRENT = @THENC_LIB_CURRENT@ - THENC_LIB_REVISION = @THENC_LIB_REVISION@ - THEORADEC_LDFLAGS = @THEORADEC_LDFLAGS@ - THEORAENC_LDFLAGS = @THEORAENC_LDFLAGS@ --THEORA_DISABLE_ENCODE_FALSE = @THEORA_DISABLE_ENCODE_FALSE@ --THEORA_DISABLE_ENCODE_TRUE = @THEORA_DISABLE_ENCODE_TRUE@ --THEORA_DISABLE_FLOAT_FALSE = @THEORA_DISABLE_FLOAT_FALSE@ --THEORA_DISABLE_FLOAT_TRUE = @THEORA_DISABLE_FLOAT_TRUE@ --THEORA_ENABLE_EXAMPLES_FALSE = @THEORA_ENABLE_EXAMPLES_FALSE@ --THEORA_ENABLE_EXAMPLES_TRUE = @THEORA_ENABLE_EXAMPLES_TRUE@ - THEORA_LDFLAGS = @THEORA_LDFLAGS@ - TH_LIB_AGE = @TH_LIB_AGE@ - TH_LIB_CURRENT = @TH_LIB_CURRENT@ - TH_LIB_REVISION = @TH_LIB_REVISION@ - VALGRIND_ENVIRONMENT = @VALGRIND_ENVIRONMENT@ - VERSION = @VERSION@ --VORBISENC_LIBS = @VORBISENC_LIBS@ --VORBISFILE_LIBS = @VORBISFILE_LIBS@ - VORBIS_CFLAGS = @VORBIS_CFLAGS@ - VORBIS_LIBS = @VORBIS_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -@@ -205,6 +186,7 @@ build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION) -@@ -232,12 +214,15 @@ program_transform_name = @program_transf - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target = @target@ - target_alias = @target_alias@ - target_cpu = @target_cpu@ - target_os = @target_os@ - target_vendor = @target_vendor@ -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - SUBDIRS = spec - static_docs = vp3-format.txt color.html \ - draft-ietf-avt-rtp-theora-00.xml \ -@@ -258,9 +243,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_ - exit 1;; \ - esac; \ - done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ - cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign doc/Makefile -+ $(AUTOMAKE) --gnu doc/Makefile - .PRECIOUS: Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ -@@ -286,13 +271,9 @@ mostlyclean-libtool: - - clean-libtool: - -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --uninstall-info-am: - install-docDATA: $(doc_DATA) - @$(NORMAL_INSTALL) -- test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)" -+ test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" - @list='$(doc_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ -@@ -339,8 +320,7 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --mostlyclean-recursive clean-recursive distclean-recursive \ --maintainer-clean-recursive: -+$(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ -@@ -384,8 +364,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -410,8 +390,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -421,13 +401,12 @@ ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - 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; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -441,22 +420,21 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - - distdir: $(DISTFILES) -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkdir_p) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -470,7 +448,7 @@ distdir: $(DISTFILES) - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ -- || $(mkdir_p) "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ -@@ -478,6 +456,8 @@ distdir: $(DISTFILES) - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ -+ am__remove_distdir=: \ -+ am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ -@@ -491,7 +471,7 @@ all-am: Makefile $(DATA) - installdirs: installdirs-recursive - installdirs-am: - for dir in "$(DESTDIR)$(docdir)"; do \ -- test -z "$$dir" || $(mkdir_p) "$$dir"; \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done - install: install-recursive - install-exec: install-exec-recursive -@@ -523,8 +503,7 @@ clean-am: clean-generic clean-libtool cl - - distclean: distclean-recursive - -rm -f Makefile --distclean-am: clean-am distclean-generic distclean-libtool \ -- distclean-tags -+distclean-am: clean-am distclean-generic distclean-tags - - dvi: dvi-recursive - -@@ -538,12 +517,20 @@ info-am: - - install-data-am: install-data-local install-docDATA - -+install-dvi: install-dvi-recursive -+ - install-exec-am: - -+install-html: install-html-recursive -+ - install-info: install-info-recursive - - install-man: - -+install-pdf: install-pdf-recursive -+ -+install-ps: install-ps-recursive -+ - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -562,24 +549,25 @@ ps: ps-recursive - - ps-am: - --uninstall-am: uninstall-docDATA uninstall-info-am uninstall-local -+uninstall-am: uninstall-docDATA uninstall-local - --uninstall-info: uninstall-info-recursive -+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ -+ install-strip - --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ -- clean clean-generic clean-libtool clean-local clean-recursive \ -- ctags ctags-recursive dist-hook distclean distclean-generic \ -- distclean-libtool distclean-recursive distclean-tags distdir \ -- dvi dvi-am html html-am info info-am install install-am \ -+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am check check-am clean clean-generic clean-libtool \ -+ clean-local ctags ctags-recursive dist-hook distclean \ -+ distclean-generic distclean-libtool distclean-tags distdir dvi \ -+ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-local \ -- install-docDATA install-exec install-exec-am install-info \ -- install-info-am install-man install-strip installcheck \ -+ install-docDATA install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic maintainer-clean-recursive \ -- mostlyclean mostlyclean-generic mostlyclean-libtool \ -- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am uninstall-docDATA uninstall-info-am \ -- uninstall-local -+ maintainer-clean-generic mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -+ uninstall uninstall-am uninstall-docDATA uninstall-local - - - @HAVE_DOXYGEN_TRUE@doxygen-build.stamp: Doxyfile $(top_srcdir)/include/theora/*.h -Index: libtheora-1.0/doc/spec/Makefile.in -=================================================================== ---- libtheora-1.0.orig/doc/spec/Makefile.in -+++ libtheora-1.0/doc/spec/Makefile.in -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.9.6 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 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,15 +18,11 @@ - # requires transfig and pdflatex - - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../.. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -46,9 +42,7 @@ subdir = doc/spec - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ -- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/pkg.m4 \ -- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/vorbis.m4 \ -- $(top_srcdir)/configure.ac -+ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(install_sh) -d -@@ -58,17 +52,18 @@ PROGRAMS = $(noinst_PROGRAMS) - am_vp3huff_OBJECTS = vp3huff.$(OBJEXT) - vp3huff_OBJECTS = $(am_vp3huff_OBJECTS) - vp3huff_LDADD = $(LDADD) --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -- $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ - SOURCES = $(vp3huff_SOURCES) - DIST_SOURCES = $(vp3huff_SOURCES) - am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -@@ -85,8 +80,6 @@ CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -96,17 +89,11 @@ AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ - BINDIR = @BINDIR@ - BUILDABLE_EXAMPLES = @BUILDABLE_EXAMPLES@ --BUILD_SPEC_FALSE = @BUILD_SPEC_FALSE@ --BUILD_SPEC_TRUE = @BUILD_SPEC_TRUE@ - CC = @CC@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CPU_x86_32_FALSE = @CPU_x86_32_FALSE@ --CPU_x86_32_TRUE = @CPU_x86_32_TRUE@ --CPU_x86_64_FALSE = @CPU_x86_64_FALSE@ --CPU_x86_64_TRUE = @CPU_x86_64_TRUE@ - CXX = @CXX@ - CXXCPP = @CXXCPP@ - CXXDEPMODE = @CXXDEPMODE@ -@@ -117,6 +104,7 @@ DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DOCDIR = @DOCDIR@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -129,13 +117,11 @@ GETOPT_OBJS = @GETOPT_OBJS@ - GREP = @GREP@ - HAVE_BIBTEX = @HAVE_BIBTEX@ - HAVE_DOXYGEN = @HAVE_DOXYGEN@ --HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ --HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ - HAVE_PDFLATEX = @HAVE_PDFLATEX@ --HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ - HAVE_TRANSFIG = @HAVE_TRANSFIG@ - HAVE_VALGRIND = @HAVE_VALGRIND@ - INCLUDEDIR = @INCLUDEDIR@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -148,13 +134,11 @@ LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OC_X86ASM_FALSE = @OC_X86ASM_FALSE@ --OC_X86ASM_TRUE = @OC_X86ASM_TRUE@ - OGG_CFLAGS = @OGG_CFLAGS@ - OGG_LIBS = @OGG_LIBS@ - PACKAGE = @PACKAGE@ -@@ -169,9 +153,12 @@ PNG_CFLAGS = @PNG_CFLAGS@ - PNG_LIBS = @PNG_LIBS@ - PROFILE = @PROFILE@ - RANLIB = @RANLIB@ -+REQUIRES_OGG = @REQUIRES_OGG@ -+REQUIRES_SDL = @REQUIRES_SDL@ -+REQUIRES_VORBIS = @REQUIRES_VORBIS@ - SDL_CFLAGS = @SDL_CFLAGS@ --SDL_CONFIG = @SDL_CONFIG@ - SDL_LIBS = @SDL_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -183,29 +170,21 @@ THENC_LIB_CURRENT = @THENC_LIB_CURRENT@ - THENC_LIB_REVISION = @THENC_LIB_REVISION@ - THEORADEC_LDFLAGS = @THEORADEC_LDFLAGS@ - THEORAENC_LDFLAGS = @THEORAENC_LDFLAGS@ --THEORA_DISABLE_ENCODE_FALSE = @THEORA_DISABLE_ENCODE_FALSE@ --THEORA_DISABLE_ENCODE_TRUE = @THEORA_DISABLE_ENCODE_TRUE@ --THEORA_DISABLE_FLOAT_FALSE = @THEORA_DISABLE_FLOAT_FALSE@ --THEORA_DISABLE_FLOAT_TRUE = @THEORA_DISABLE_FLOAT_TRUE@ --THEORA_ENABLE_EXAMPLES_FALSE = @THEORA_ENABLE_EXAMPLES_FALSE@ --THEORA_ENABLE_EXAMPLES_TRUE = @THEORA_ENABLE_EXAMPLES_TRUE@ - THEORA_LDFLAGS = @THEORA_LDFLAGS@ - TH_LIB_AGE = @TH_LIB_AGE@ - TH_LIB_CURRENT = @TH_LIB_CURRENT@ - TH_LIB_REVISION = @TH_LIB_REVISION@ - VALGRIND_ENVIRONMENT = @VALGRIND_ENVIRONMENT@ - VERSION = @VERSION@ --VORBISENC_LIBS = @VORBISENC_LIBS@ --VORBISFILE_LIBS = @VORBISFILE_LIBS@ - VORBIS_CFLAGS = @VORBIS_CFLAGS@ - VORBIS_LIBS = @VORBIS_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -@@ -217,6 +196,7 @@ build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION) -@@ -244,12 +224,15 @@ program_transform_name = @program_transf - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target = @target@ - target_alias = @target_alias@ - target_cpu = @target_cpu@ - target_os = @target_os@ - target_vendor = @target_vendor@ -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - built_docs = Theora.pdf - @BUILD_SPEC_TRUE@doc_DATA = $(built_docs) - SPEC_SRCS = spec.tex spec.bib -@@ -280,9 +263,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_ - exit 1;; \ - esac; \ - done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/spec/Makefile'; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/spec/Makefile'; \ - cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign doc/spec/Makefile -+ $(AUTOMAKE) --gnu doc/spec/Makefile - .PRECIOUS: Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ -@@ -309,7 +292,7 @@ clean-noinstPROGRAMS: - done - vp3huff$(EXEEXT): $(vp3huff_OBJECTS) $(vp3huff_DEPENDENCIES) - @rm -f vp3huff$(EXEEXT) -- $(LINK) $(vp3huff_LDFLAGS) $(vp3huff_OBJECTS) $(vp3huff_LDADD) $(LIBS) -+ $(LINK) $(vp3huff_OBJECTS) $(vp3huff_LDADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -320,22 +303,22 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vp3huff.Po@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(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@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ mv -f $(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@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(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 $@ $< -@@ -345,13 +328,9 @@ mostlyclean-libtool: - - clean-libtool: - -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --uninstall-info-am: - install-docDATA: $(doc_DATA) - @$(NORMAL_INSTALL) -- test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)" -+ test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" - @list='$(doc_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ -@@ -372,8 +351,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -385,8 +364,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -396,13 +375,12 @@ ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - 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; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -416,22 +394,21 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - - distdir: $(DISTFILES) -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkdir_p) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -447,7 +424,7 @@ check: check-am - all-am: Makefile $(PROGRAMS) $(DATA) - installdirs: - for dir in "$(DESTDIR)$(docdir)"; do \ -- test -z "$$dir" || $(mkdir_p) "$$dir"; \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done - install: install-am - install-exec: install-exec-am -@@ -482,7 +459,7 @@ distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-tags -+ distclean-tags - - dvi: dvi-am - -@@ -496,12 +473,20 @@ info-am: - - install-data-am: install-docDATA - -+install-dvi: install-dvi-am -+ - install-exec-am: - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -523,20 +508,24 @@ ps: ps-am - - ps-am: - --uninstall-am: uninstall-docDATA uninstall-info-am -+uninstall-am: uninstall-docDATA -+ -+.MAKE: install-am install-strip - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-local clean-noinstPROGRAMS ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ -- install-docDATA install-exec install-exec-am install-info \ -- install-info-am install-man install-strip installcheck \ -+ install-docDATA install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic maintainer-clean-local mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ -- uninstall-docDATA uninstall-info-am -+ uninstall-docDATA - - - # latex three times is the charm with references -Index: libtheora-1.0/examples/Makefile.in -=================================================================== ---- libtheora-1.0.orig/examples/Makefile.in -+++ libtheora-1.0/examples/Makefile.in -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.9.6 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 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. -@@ -14,15 +14,11 @@ - - @SET_MAKE@ - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,22 +33,19 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - target_triplet = @target@ --noinst_PROGRAMS = dump_video$(EXEEXT) $(am__EXEEXT_1) -+noinst_PROGRAMS = dump_video$(EXEEXT) $(BUILDABLE_EXAMPLES) - EXTRA_PROGRAMS = player_example$(EXEEXT) encoder_example$(EXEEXT) \ - png2theora$(EXEEXT) - subdir = examples - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ -- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/pkg.m4 \ -- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/vorbis.m4 \ -- $(top_srcdir)/configure.ac -+ $(top_srcdir)/m4/pkg.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 = --am__EXEEXT_1 = @BUILDABLE_EXAMPLES@ - PROGRAMS = $(noinst_PROGRAMS) - am_dump_video_OBJECTS = dump_video.$(OBJEXT) - dump_video_OBJECTS = $(am_dump_video_OBJECTS) -@@ -63,23 +56,33 @@ am_encoder_example_OBJECTS = \ - encoder_example_OBJECTS = $(am_encoder_example_OBJECTS) - am__DEPENDENCIES_3 = ../lib/libtheoraenc.la ../lib/libtheoradec.la \ - $(am__DEPENDENCIES_1) -+encoder_example_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(encoder_example_CFLAGS) \ -+ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - am_player_example_OBJECTS = player_example-player_example.$(OBJEXT) - player_example_OBJECTS = $(am_player_example_OBJECTS) - player_example_DEPENDENCIES = $(am__DEPENDENCIES_2) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -+player_example_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(player_example_CFLAGS) \ -+ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - am_png2theora_OBJECTS = png2theora-png2theora.$(OBJEXT) - png2theora_OBJECTS = $(am_png2theora_OBJECTS) --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+png2theora_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(png2theora_CFLAGS) \ -+ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -- $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ - SOURCES = $(dump_video_SOURCES) $(EXTRA_dump_video_SOURCES) \ - $(encoder_example_SOURCES) $(EXTRA_encoder_example_SOURCES) \ - $(player_example_SOURCES) $(png2theora_SOURCES) -@@ -91,8 +94,6 @@ CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -102,17 +103,11 @@ AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ - BINDIR = @BINDIR@ - BUILDABLE_EXAMPLES = @BUILDABLE_EXAMPLES@ --BUILD_SPEC_FALSE = @BUILD_SPEC_FALSE@ --BUILD_SPEC_TRUE = @BUILD_SPEC_TRUE@ - CC = @CC@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CPU_x86_32_FALSE = @CPU_x86_32_FALSE@ --CPU_x86_32_TRUE = @CPU_x86_32_TRUE@ --CPU_x86_64_FALSE = @CPU_x86_64_FALSE@ --CPU_x86_64_TRUE = @CPU_x86_64_TRUE@ - CXX = @CXX@ - CXXCPP = @CXXCPP@ - CXXDEPMODE = @CXXDEPMODE@ -@@ -123,6 +118,7 @@ DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DOCDIR = @DOCDIR@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -135,13 +131,11 @@ GETOPT_OBJS = @GETOPT_OBJS@ - GREP = @GREP@ - HAVE_BIBTEX = @HAVE_BIBTEX@ - HAVE_DOXYGEN = @HAVE_DOXYGEN@ --HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ --HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ - HAVE_PDFLATEX = @HAVE_PDFLATEX@ --HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ - HAVE_TRANSFIG = @HAVE_TRANSFIG@ - HAVE_VALGRIND = @HAVE_VALGRIND@ - INCLUDEDIR = @INCLUDEDIR@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -154,13 +148,11 @@ LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OC_X86ASM_FALSE = @OC_X86ASM_FALSE@ --OC_X86ASM_TRUE = @OC_X86ASM_TRUE@ - OGG_CFLAGS = @OGG_CFLAGS@ - OGG_LIBS = @OGG_LIBS@ - PACKAGE = @PACKAGE@ -@@ -175,9 +167,12 @@ PNG_CFLAGS = @PNG_CFLAGS@ - PNG_LIBS = @PNG_LIBS@ - PROFILE = @PROFILE@ - RANLIB = @RANLIB@ -+REQUIRES_OGG = @REQUIRES_OGG@ -+REQUIRES_SDL = @REQUIRES_SDL@ -+REQUIRES_VORBIS = @REQUIRES_VORBIS@ - SDL_CFLAGS = @SDL_CFLAGS@ --SDL_CONFIG = @SDL_CONFIG@ - SDL_LIBS = @SDL_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -189,29 +184,21 @@ THENC_LIB_CURRENT = @THENC_LIB_CURRENT@ - THENC_LIB_REVISION = @THENC_LIB_REVISION@ - THEORADEC_LDFLAGS = @THEORADEC_LDFLAGS@ - THEORAENC_LDFLAGS = @THEORAENC_LDFLAGS@ --THEORA_DISABLE_ENCODE_FALSE = @THEORA_DISABLE_ENCODE_FALSE@ --THEORA_DISABLE_ENCODE_TRUE = @THEORA_DISABLE_ENCODE_TRUE@ --THEORA_DISABLE_FLOAT_FALSE = @THEORA_DISABLE_FLOAT_FALSE@ --THEORA_DISABLE_FLOAT_TRUE = @THEORA_DISABLE_FLOAT_TRUE@ --THEORA_ENABLE_EXAMPLES_FALSE = @THEORA_ENABLE_EXAMPLES_FALSE@ --THEORA_ENABLE_EXAMPLES_TRUE = @THEORA_ENABLE_EXAMPLES_TRUE@ - THEORA_LDFLAGS = @THEORA_LDFLAGS@ - TH_LIB_AGE = @TH_LIB_AGE@ - TH_LIB_CURRENT = @TH_LIB_CURRENT@ - TH_LIB_REVISION = @TH_LIB_REVISION@ - VALGRIND_ENVIRONMENT = @VALGRIND_ENVIRONMENT@ - VERSION = @VERSION@ --VORBISENC_LIBS = @VORBISENC_LIBS@ --VORBISFILE_LIBS = @VORBISFILE_LIBS@ - VORBIS_CFLAGS = @VORBIS_CFLAGS@ - VORBIS_LIBS = @VORBIS_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -@@ -223,6 +210,7 @@ build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -250,12 +238,15 @@ program_transform_name = @program_transf - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target = @target@ - target_alias = @target_alias@ - target_cpu = @target_cpu@ - target_os = @target_os@ - target_vendor = @target_vendor@ -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - INCLUDES = -I$(top_srcdir)/include - AM_CFLAGS = $(OGG_CFLAGS) - LDADD = ../lib/libtheora.la $(OGG_LIBS) -@@ -289,9 +280,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_ - exit 1;; \ - esac; \ - done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/Makefile'; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/Makefile'; \ - cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign examples/Makefile -+ $(AUTOMAKE) --gnu examples/Makefile - .PRECIOUS: Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ -@@ -318,16 +309,16 @@ clean-noinstPROGRAMS: - done - dump_video$(EXEEXT): $(dump_video_OBJECTS) $(dump_video_DEPENDENCIES) - @rm -f dump_video$(EXEEXT) -- $(LINK) $(dump_video_LDFLAGS) $(dump_video_OBJECTS) $(dump_video_LDADD) $(LIBS) -+ $(LINK) $(dump_video_OBJECTS) $(dump_video_LDADD) $(LIBS) - encoder_example$(EXEEXT): $(encoder_example_OBJECTS) $(encoder_example_DEPENDENCIES) - @rm -f encoder_example$(EXEEXT) -- $(LINK) $(encoder_example_LDFLAGS) $(encoder_example_OBJECTS) $(encoder_example_LDADD) $(LIBS) -+ $(encoder_example_LINK) $(encoder_example_OBJECTS) $(encoder_example_LDADD) $(LIBS) - player_example$(EXEEXT): $(player_example_OBJECTS) $(player_example_DEPENDENCIES) - @rm -f player_example$(EXEEXT) -- $(LINK) $(player_example_LDFLAGS) $(player_example_OBJECTS) $(player_example_LDADD) $(LIBS) -+ $(player_example_LINK) $(player_example_OBJECTS) $(player_example_LDADD) $(LIBS) - png2theora$(EXEEXT): $(png2theora_OBJECTS) $(png2theora_DEPENDENCIES) - @rm -f png2theora$(EXEEXT) -- $(LINK) $(png2theora_LDFLAGS) $(png2theora_OBJECTS) $(png2theora_LDADD) $(LIBS) -+ $(png2theora_LINK) $(png2theora_OBJECTS) $(png2theora_LDADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -345,92 +336,92 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/png2theora-png2theora.Po@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(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@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ mv -f $(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@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(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 $@ $< - - encoder_example-encoder_example.o: encoder_example.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(encoder_example_CFLAGS) $(CFLAGS) -MT encoder_example-encoder_example.o -MD -MP -MF "$(DEPDIR)/encoder_example-encoder_example.Tpo" -c -o encoder_example-encoder_example.o `test -f 'encoder_example.c' || echo '$(srcdir)/'`encoder_example.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/encoder_example-encoder_example.Tpo" "$(DEPDIR)/encoder_example-encoder_example.Po"; else rm -f "$(DEPDIR)/encoder_example-encoder_example.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(encoder_example_CFLAGS) $(CFLAGS) -MT encoder_example-encoder_example.o -MD -MP -MF $(DEPDIR)/encoder_example-encoder_example.Tpo -c -o encoder_example-encoder_example.o `test -f 'encoder_example.c' || echo '$(srcdir)/'`encoder_example.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/encoder_example-encoder_example.Tpo $(DEPDIR)/encoder_example-encoder_example.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='encoder_example.c' object='encoder_example-encoder_example.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) $(encoder_example_CFLAGS) $(CFLAGS) -c -o encoder_example-encoder_example.o `test -f 'encoder_example.c' || echo '$(srcdir)/'`encoder_example.c - - encoder_example-encoder_example.obj: encoder_example.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(encoder_example_CFLAGS) $(CFLAGS) -MT encoder_example-encoder_example.obj -MD -MP -MF "$(DEPDIR)/encoder_example-encoder_example.Tpo" -c -o encoder_example-encoder_example.obj `if test -f 'encoder_example.c'; then $(CYGPATH_W) 'encoder_example.c'; else $(CYGPATH_W) '$(srcdir)/encoder_example.c'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/encoder_example-encoder_example.Tpo" "$(DEPDIR)/encoder_example-encoder_example.Po"; else rm -f "$(DEPDIR)/encoder_example-encoder_example.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(encoder_example_CFLAGS) $(CFLAGS) -MT encoder_example-encoder_example.obj -MD -MP -MF $(DEPDIR)/encoder_example-encoder_example.Tpo -c -o encoder_example-encoder_example.obj `if test -f 'encoder_example.c'; then $(CYGPATH_W) 'encoder_example.c'; else $(CYGPATH_W) '$(srcdir)/encoder_example.c'; fi` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/encoder_example-encoder_example.Tpo $(DEPDIR)/encoder_example-encoder_example.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='encoder_example.c' object='encoder_example-encoder_example.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) $(encoder_example_CFLAGS) $(CFLAGS) -c -o encoder_example-encoder_example.obj `if test -f 'encoder_example.c'; then $(CYGPATH_W) 'encoder_example.c'; else $(CYGPATH_W) '$(srcdir)/encoder_example.c'; fi` - - encoder_example-getopt.o: getopt.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(encoder_example_CFLAGS) $(CFLAGS) -MT encoder_example-getopt.o -MD -MP -MF "$(DEPDIR)/encoder_example-getopt.Tpo" -c -o encoder_example-getopt.o `test -f 'getopt.c' || echo '$(srcdir)/'`getopt.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/encoder_example-getopt.Tpo" "$(DEPDIR)/encoder_example-getopt.Po"; else rm -f "$(DEPDIR)/encoder_example-getopt.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(encoder_example_CFLAGS) $(CFLAGS) -MT encoder_example-getopt.o -MD -MP -MF $(DEPDIR)/encoder_example-getopt.Tpo -c -o encoder_example-getopt.o `test -f 'getopt.c' || echo '$(srcdir)/'`getopt.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/encoder_example-getopt.Tpo $(DEPDIR)/encoder_example-getopt.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='getopt.c' object='encoder_example-getopt.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) $(encoder_example_CFLAGS) $(CFLAGS) -c -o encoder_example-getopt.o `test -f 'getopt.c' || echo '$(srcdir)/'`getopt.c - - encoder_example-getopt.obj: getopt.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(encoder_example_CFLAGS) $(CFLAGS) -MT encoder_example-getopt.obj -MD -MP -MF "$(DEPDIR)/encoder_example-getopt.Tpo" -c -o encoder_example-getopt.obj `if test -f 'getopt.c'; then $(CYGPATH_W) 'getopt.c'; else $(CYGPATH_W) '$(srcdir)/getopt.c'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/encoder_example-getopt.Tpo" "$(DEPDIR)/encoder_example-getopt.Po"; else rm -f "$(DEPDIR)/encoder_example-getopt.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(encoder_example_CFLAGS) $(CFLAGS) -MT encoder_example-getopt.obj -MD -MP -MF $(DEPDIR)/encoder_example-getopt.Tpo -c -o encoder_example-getopt.obj `if test -f 'getopt.c'; then $(CYGPATH_W) 'getopt.c'; else $(CYGPATH_W) '$(srcdir)/getopt.c'; fi` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/encoder_example-getopt.Tpo $(DEPDIR)/encoder_example-getopt.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='getopt.c' object='encoder_example-getopt.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) $(encoder_example_CFLAGS) $(CFLAGS) -c -o encoder_example-getopt.obj `if test -f 'getopt.c'; then $(CYGPATH_W) 'getopt.c'; else $(CYGPATH_W) '$(srcdir)/getopt.c'; fi` - - encoder_example-getopt1.o: getopt1.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(encoder_example_CFLAGS) $(CFLAGS) -MT encoder_example-getopt1.o -MD -MP -MF "$(DEPDIR)/encoder_example-getopt1.Tpo" -c -o encoder_example-getopt1.o `test -f 'getopt1.c' || echo '$(srcdir)/'`getopt1.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/encoder_example-getopt1.Tpo" "$(DEPDIR)/encoder_example-getopt1.Po"; else rm -f "$(DEPDIR)/encoder_example-getopt1.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(encoder_example_CFLAGS) $(CFLAGS) -MT encoder_example-getopt1.o -MD -MP -MF $(DEPDIR)/encoder_example-getopt1.Tpo -c -o encoder_example-getopt1.o `test -f 'getopt1.c' || echo '$(srcdir)/'`getopt1.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/encoder_example-getopt1.Tpo $(DEPDIR)/encoder_example-getopt1.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='getopt1.c' object='encoder_example-getopt1.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) $(encoder_example_CFLAGS) $(CFLAGS) -c -o encoder_example-getopt1.o `test -f 'getopt1.c' || echo '$(srcdir)/'`getopt1.c - - encoder_example-getopt1.obj: getopt1.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(encoder_example_CFLAGS) $(CFLAGS) -MT encoder_example-getopt1.obj -MD -MP -MF "$(DEPDIR)/encoder_example-getopt1.Tpo" -c -o encoder_example-getopt1.obj `if test -f 'getopt1.c'; then $(CYGPATH_W) 'getopt1.c'; else $(CYGPATH_W) '$(srcdir)/getopt1.c'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/encoder_example-getopt1.Tpo" "$(DEPDIR)/encoder_example-getopt1.Po"; else rm -f "$(DEPDIR)/encoder_example-getopt1.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(encoder_example_CFLAGS) $(CFLAGS) -MT encoder_example-getopt1.obj -MD -MP -MF $(DEPDIR)/encoder_example-getopt1.Tpo -c -o encoder_example-getopt1.obj `if test -f 'getopt1.c'; then $(CYGPATH_W) 'getopt1.c'; else $(CYGPATH_W) '$(srcdir)/getopt1.c'; fi` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/encoder_example-getopt1.Tpo $(DEPDIR)/encoder_example-getopt1.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='getopt1.c' object='encoder_example-getopt1.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) $(encoder_example_CFLAGS) $(CFLAGS) -c -o encoder_example-getopt1.obj `if test -f 'getopt1.c'; then $(CYGPATH_W) 'getopt1.c'; else $(CYGPATH_W) '$(srcdir)/getopt1.c'; fi` - - player_example-player_example.o: player_example.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(player_example_CFLAGS) $(CFLAGS) -MT player_example-player_example.o -MD -MP -MF "$(DEPDIR)/player_example-player_example.Tpo" -c -o player_example-player_example.o `test -f 'player_example.c' || echo '$(srcdir)/'`player_example.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/player_example-player_example.Tpo" "$(DEPDIR)/player_example-player_example.Po"; else rm -f "$(DEPDIR)/player_example-player_example.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(player_example_CFLAGS) $(CFLAGS) -MT player_example-player_example.o -MD -MP -MF $(DEPDIR)/player_example-player_example.Tpo -c -o player_example-player_example.o `test -f 'player_example.c' || echo '$(srcdir)/'`player_example.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/player_example-player_example.Tpo $(DEPDIR)/player_example-player_example.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='player_example.c' object='player_example-player_example.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) $(player_example_CFLAGS) $(CFLAGS) -c -o player_example-player_example.o `test -f 'player_example.c' || echo '$(srcdir)/'`player_example.c - - player_example-player_example.obj: player_example.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(player_example_CFLAGS) $(CFLAGS) -MT player_example-player_example.obj -MD -MP -MF "$(DEPDIR)/player_example-player_example.Tpo" -c -o player_example-player_example.obj `if test -f 'player_example.c'; then $(CYGPATH_W) 'player_example.c'; else $(CYGPATH_W) '$(srcdir)/player_example.c'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/player_example-player_example.Tpo" "$(DEPDIR)/player_example-player_example.Po"; else rm -f "$(DEPDIR)/player_example-player_example.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(player_example_CFLAGS) $(CFLAGS) -MT player_example-player_example.obj -MD -MP -MF $(DEPDIR)/player_example-player_example.Tpo -c -o player_example-player_example.obj `if test -f 'player_example.c'; then $(CYGPATH_W) 'player_example.c'; else $(CYGPATH_W) '$(srcdir)/player_example.c'; fi` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/player_example-player_example.Tpo $(DEPDIR)/player_example-player_example.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='player_example.c' object='player_example-player_example.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) $(player_example_CFLAGS) $(CFLAGS) -c -o player_example-player_example.obj `if test -f 'player_example.c'; then $(CYGPATH_W) 'player_example.c'; else $(CYGPATH_W) '$(srcdir)/player_example.c'; fi` - - png2theora-png2theora.o: png2theora.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(png2theora_CFLAGS) $(CFLAGS) -MT png2theora-png2theora.o -MD -MP -MF "$(DEPDIR)/png2theora-png2theora.Tpo" -c -o png2theora-png2theora.o `test -f 'png2theora.c' || echo '$(srcdir)/'`png2theora.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/png2theora-png2theora.Tpo" "$(DEPDIR)/png2theora-png2theora.Po"; else rm -f "$(DEPDIR)/png2theora-png2theora.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(png2theora_CFLAGS) $(CFLAGS) -MT png2theora-png2theora.o -MD -MP -MF $(DEPDIR)/png2theora-png2theora.Tpo -c -o png2theora-png2theora.o `test -f 'png2theora.c' || echo '$(srcdir)/'`png2theora.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/png2theora-png2theora.Tpo $(DEPDIR)/png2theora-png2theora.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='png2theora.c' object='png2theora-png2theora.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) $(png2theora_CFLAGS) $(CFLAGS) -c -o png2theora-png2theora.o `test -f 'png2theora.c' || echo '$(srcdir)/'`png2theora.c - - png2theora-png2theora.obj: png2theora.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(png2theora_CFLAGS) $(CFLAGS) -MT png2theora-png2theora.obj -MD -MP -MF "$(DEPDIR)/png2theora-png2theora.Tpo" -c -o png2theora-png2theora.obj `if test -f 'png2theora.c'; then $(CYGPATH_W) 'png2theora.c'; else $(CYGPATH_W) '$(srcdir)/png2theora.c'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/png2theora-png2theora.Tpo" "$(DEPDIR)/png2theora-png2theora.Po"; else rm -f "$(DEPDIR)/png2theora-png2theora.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(png2theora_CFLAGS) $(CFLAGS) -MT png2theora-png2theora.obj -MD -MP -MF $(DEPDIR)/png2theora-png2theora.Tpo -c -o png2theora-png2theora.obj `if test -f 'png2theora.c'; then $(CYGPATH_W) 'png2theora.c'; else $(CYGPATH_W) '$(srcdir)/png2theora.c'; fi` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/png2theora-png2theora.Tpo $(DEPDIR)/png2theora-png2theora.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='png2theora.c' object='png2theora-png2theora.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) $(png2theora_CFLAGS) $(CFLAGS) -c -o png2theora-png2theora.obj `if test -f 'png2theora.c'; then $(CYGPATH_W) 'png2theora.c'; else $(CYGPATH_W) '$(srcdir)/png2theora.c'; fi` -@@ -441,17 +432,13 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --distclean-libtool: -- -rm -f libtool --uninstall-info-am: -- - 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; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -463,8 +450,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -474,13 +461,12 @@ ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - 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; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -494,22 +480,21 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - - distdir: $(DISTFILES) -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkdir_p) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -557,7 +542,7 @@ distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-tags -+ distclean-tags - - dvi: dvi-am - -@@ -571,12 +556,20 @@ info-am: - - install-data-am: - -+install-dvi: install-dvi-am -+ - install-exec-am: - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -597,19 +590,22 @@ ps: ps-am - - ps-am: - --uninstall-am: uninstall-info-am -+uninstall-am: -+ -+.MAKE: install-am install-strip - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-exec \ -- install-exec-am install-info install-info-am install-man \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -- pdf pdf-am ps ps-am tags uninstall uninstall-am \ -- uninstall-info-am -+ pdf pdf-am ps ps-am tags uninstall uninstall-am - - - debug: -Index: libtheora-1.0/include/Makefile.in -=================================================================== ---- libtheora-1.0.orig/include/Makefile.in -+++ libtheora-1.0/include/Makefile.in -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.9.6 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 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. -@@ -13,15 +13,11 @@ - # PARTICULAR PURPOSE. - - @SET_MAKE@ --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -40,9 +36,7 @@ subdir = include - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ -- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/pkg.m4 \ -- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/vorbis.m4 \ -- $(top_srcdir)/configure.ac -+ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(install_sh) -d -@@ -52,18 +46,19 @@ SOURCES = - DIST_SOURCES = - RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ -- install-exec-recursive install-info-recursive \ -- install-recursive installcheck-recursive installdirs-recursive \ -- pdf-recursive ps-recursive uninstall-info-recursive \ -- uninstall-recursive -+ install-dvi-recursive install-exec-recursive \ -+ install-html-recursive install-info-recursive \ -+ install-pdf-recursive install-ps-recursive install-recursive \ -+ installcheck-recursive installdirs-recursive pdf-recursive \ -+ ps-recursive uninstall-recursive -+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ -+ distclean-recursive maintainer-clean-recursive - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = $(SUBDIRS) - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -73,17 +68,11 @@ AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ - BINDIR = @BINDIR@ - BUILDABLE_EXAMPLES = @BUILDABLE_EXAMPLES@ --BUILD_SPEC_FALSE = @BUILD_SPEC_FALSE@ --BUILD_SPEC_TRUE = @BUILD_SPEC_TRUE@ - CC = @CC@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CPU_x86_32_FALSE = @CPU_x86_32_FALSE@ --CPU_x86_32_TRUE = @CPU_x86_32_TRUE@ --CPU_x86_64_FALSE = @CPU_x86_64_FALSE@ --CPU_x86_64_TRUE = @CPU_x86_64_TRUE@ - CXX = @CXX@ - CXXCPP = @CXXCPP@ - CXXDEPMODE = @CXXDEPMODE@ -@@ -94,6 +83,7 @@ DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DOCDIR = @DOCDIR@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -106,13 +96,11 @@ GETOPT_OBJS = @GETOPT_OBJS@ - GREP = @GREP@ - HAVE_BIBTEX = @HAVE_BIBTEX@ - HAVE_DOXYGEN = @HAVE_DOXYGEN@ --HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ --HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ - HAVE_PDFLATEX = @HAVE_PDFLATEX@ --HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ - HAVE_TRANSFIG = @HAVE_TRANSFIG@ - HAVE_VALGRIND = @HAVE_VALGRIND@ - INCLUDEDIR = @INCLUDEDIR@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -125,13 +113,11 @@ LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OC_X86ASM_FALSE = @OC_X86ASM_FALSE@ --OC_X86ASM_TRUE = @OC_X86ASM_TRUE@ - OGG_CFLAGS = @OGG_CFLAGS@ - OGG_LIBS = @OGG_LIBS@ - PACKAGE = @PACKAGE@ -@@ -146,9 +132,12 @@ PNG_CFLAGS = @PNG_CFLAGS@ - PNG_LIBS = @PNG_LIBS@ - PROFILE = @PROFILE@ - RANLIB = @RANLIB@ -+REQUIRES_OGG = @REQUIRES_OGG@ -+REQUIRES_SDL = @REQUIRES_SDL@ -+REQUIRES_VORBIS = @REQUIRES_VORBIS@ - SDL_CFLAGS = @SDL_CFLAGS@ --SDL_CONFIG = @SDL_CONFIG@ - SDL_LIBS = @SDL_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -160,29 +149,21 @@ THENC_LIB_CURRENT = @THENC_LIB_CURRENT@ - THENC_LIB_REVISION = @THENC_LIB_REVISION@ - THEORADEC_LDFLAGS = @THEORADEC_LDFLAGS@ - THEORAENC_LDFLAGS = @THEORAENC_LDFLAGS@ --THEORA_DISABLE_ENCODE_FALSE = @THEORA_DISABLE_ENCODE_FALSE@ --THEORA_DISABLE_ENCODE_TRUE = @THEORA_DISABLE_ENCODE_TRUE@ --THEORA_DISABLE_FLOAT_FALSE = @THEORA_DISABLE_FLOAT_FALSE@ --THEORA_DISABLE_FLOAT_TRUE = @THEORA_DISABLE_FLOAT_TRUE@ --THEORA_ENABLE_EXAMPLES_FALSE = @THEORA_ENABLE_EXAMPLES_FALSE@ --THEORA_ENABLE_EXAMPLES_TRUE = @THEORA_ENABLE_EXAMPLES_TRUE@ - THEORA_LDFLAGS = @THEORA_LDFLAGS@ - TH_LIB_AGE = @TH_LIB_AGE@ - TH_LIB_CURRENT = @TH_LIB_CURRENT@ - TH_LIB_REVISION = @TH_LIB_REVISION@ - VALGRIND_ENVIRONMENT = @VALGRIND_ENVIRONMENT@ - VERSION = @VERSION@ --VORBISENC_LIBS = @VORBISENC_LIBS@ --VORBISFILE_LIBS = @VORBISFILE_LIBS@ - VORBIS_CFLAGS = @VORBIS_CFLAGS@ - VORBIS_LIBS = @VORBIS_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -@@ -194,6 +175,7 @@ build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -221,12 +203,15 @@ program_transform_name = @program_transf - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target = @target@ - target_alias = @target_alias@ - target_cpu = @target_cpu@ - target_os = @target_os@ - target_vendor = @target_vendor@ -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - SUBDIRS = theora - all: all-recursive - -@@ -240,9 +225,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_ - exit 1;; \ - esac; \ - done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile'; \ - cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign include/Makefile -+ $(AUTOMAKE) --gnu include/Makefile - .PRECIOUS: Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ -@@ -267,10 +252,6 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --distclean-libtool: -- -rm -f libtool --uninstall-info-am: -- - # This directory's subdirectories are mostly independent; you can cd - # into them and run `make' without going through this Makefile. - # To change the values of `make' variables: instead of editing Makefiles, -@@ -302,8 +283,7 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --mostlyclean-recursive clean-recursive distclean-recursive \ --maintainer-clean-recursive: -+$(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ -@@ -347,8 +327,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -373,8 +353,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -384,13 +364,12 @@ ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - 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; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -404,22 +383,21 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - - distdir: $(DISTFILES) -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkdir_p) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -433,7 +411,7 @@ distdir: $(DISTFILES) - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ -- || $(mkdir_p) "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ -@@ -441,6 +419,8 @@ distdir: $(DISTFILES) - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ -+ am__remove_distdir=: \ -+ am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ -@@ -480,8 +460,7 @@ clean-am: clean-generic clean-libtool mo - - distclean: distclean-recursive - -rm -f Makefile --distclean-am: clean-am distclean-generic distclean-libtool \ -- distclean-tags -+distclean-am: clean-am distclean-generic distclean-tags - - dvi: dvi-recursive - -@@ -495,12 +474,20 @@ info-am: - - install-data-am: - -+install-dvi: install-dvi-recursive -+ - install-exec-am: - -+install-html: install-html-recursive -+ - install-info: install-info-recursive - - install-man: - -+install-pdf: install-pdf-recursive -+ -+install-ps: install-ps-recursive -+ - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -519,22 +506,24 @@ ps: ps-recursive - - ps-am: - --uninstall-am: uninstall-info-am -+uninstall-am: - --uninstall-info: uninstall-info-recursive -+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ -+ install-strip - --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ -- clean clean-generic clean-libtool clean-recursive ctags \ -- ctags-recursive distclean distclean-generic distclean-libtool \ -- distclean-recursive distclean-tags distdir dvi dvi-am html \ -+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am check check-am clean clean-generic clean-libtool \ -+ ctags ctags-recursive distclean distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ -- install-data-am install-exec install-exec-am install-info \ -- install-info-am install-man install-strip installcheck \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic maintainer-clean-recursive \ -- mostlyclean mostlyclean-generic mostlyclean-libtool \ -- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am uninstall-info-am -+ maintainer-clean-generic mostlyclean mostlyclean-generic \ -+ 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. -Index: libtheora-1.0/include/theora/Makefile.in -=================================================================== ---- libtheora-1.0.orig/include/theora/Makefile.in -+++ libtheora-1.0/include/theora/Makefile.in -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.9.6 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 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. -@@ -14,15 +14,11 @@ - - @SET_MAKE@ - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../.. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -42,9 +38,7 @@ DIST_COMMON = $(noinst_HEADERS) $(srcdir - $(srcdir)/Makefile.in $(theorainclude_HEADERS) - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ -- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/pkg.m4 \ -- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/vorbis.m4 \ -- $(top_srcdir)/configure.ac -+ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(install_sh) -d -@@ -66,8 +60,6 @@ CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -77,17 +69,11 @@ AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ - BINDIR = @BINDIR@ - BUILDABLE_EXAMPLES = @BUILDABLE_EXAMPLES@ --BUILD_SPEC_FALSE = @BUILD_SPEC_FALSE@ --BUILD_SPEC_TRUE = @BUILD_SPEC_TRUE@ - CC = @CC@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CPU_x86_32_FALSE = @CPU_x86_32_FALSE@ --CPU_x86_32_TRUE = @CPU_x86_32_TRUE@ --CPU_x86_64_FALSE = @CPU_x86_64_FALSE@ --CPU_x86_64_TRUE = @CPU_x86_64_TRUE@ - CXX = @CXX@ - CXXCPP = @CXXCPP@ - CXXDEPMODE = @CXXDEPMODE@ -@@ -98,6 +84,7 @@ DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DOCDIR = @DOCDIR@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -110,13 +97,11 @@ GETOPT_OBJS = @GETOPT_OBJS@ - GREP = @GREP@ - HAVE_BIBTEX = @HAVE_BIBTEX@ - HAVE_DOXYGEN = @HAVE_DOXYGEN@ --HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ --HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ - HAVE_PDFLATEX = @HAVE_PDFLATEX@ --HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ - HAVE_TRANSFIG = @HAVE_TRANSFIG@ - HAVE_VALGRIND = @HAVE_VALGRIND@ - INCLUDEDIR = @INCLUDEDIR@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -129,13 +114,11 @@ LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OC_X86ASM_FALSE = @OC_X86ASM_FALSE@ --OC_X86ASM_TRUE = @OC_X86ASM_TRUE@ - OGG_CFLAGS = @OGG_CFLAGS@ - OGG_LIBS = @OGG_LIBS@ - PACKAGE = @PACKAGE@ -@@ -150,9 +133,12 @@ PNG_CFLAGS = @PNG_CFLAGS@ - PNG_LIBS = @PNG_LIBS@ - PROFILE = @PROFILE@ - RANLIB = @RANLIB@ -+REQUIRES_OGG = @REQUIRES_OGG@ -+REQUIRES_SDL = @REQUIRES_SDL@ -+REQUIRES_VORBIS = @REQUIRES_VORBIS@ - SDL_CFLAGS = @SDL_CFLAGS@ --SDL_CONFIG = @SDL_CONFIG@ - SDL_LIBS = @SDL_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -164,29 +150,21 @@ THENC_LIB_CURRENT = @THENC_LIB_CURRENT@ - THENC_LIB_REVISION = @THENC_LIB_REVISION@ - THEORADEC_LDFLAGS = @THEORADEC_LDFLAGS@ - THEORAENC_LDFLAGS = @THEORAENC_LDFLAGS@ --THEORA_DISABLE_ENCODE_FALSE = @THEORA_DISABLE_ENCODE_FALSE@ --THEORA_DISABLE_ENCODE_TRUE = @THEORA_DISABLE_ENCODE_TRUE@ --THEORA_DISABLE_FLOAT_FALSE = @THEORA_DISABLE_FLOAT_FALSE@ --THEORA_DISABLE_FLOAT_TRUE = @THEORA_DISABLE_FLOAT_TRUE@ --THEORA_ENABLE_EXAMPLES_FALSE = @THEORA_ENABLE_EXAMPLES_FALSE@ --THEORA_ENABLE_EXAMPLES_TRUE = @THEORA_ENABLE_EXAMPLES_TRUE@ - THEORA_LDFLAGS = @THEORA_LDFLAGS@ - TH_LIB_AGE = @TH_LIB_AGE@ - TH_LIB_CURRENT = @TH_LIB_CURRENT@ - TH_LIB_REVISION = @TH_LIB_REVISION@ - VALGRIND_ENVIRONMENT = @VALGRIND_ENVIRONMENT@ - VERSION = @VERSION@ --VORBISENC_LIBS = @VORBISENC_LIBS@ --VORBISFILE_LIBS = @VORBISFILE_LIBS@ - VORBIS_CFLAGS = @VORBIS_CFLAGS@ - VORBIS_LIBS = @VORBIS_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -@@ -198,6 +176,7 @@ build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -225,12 +204,15 @@ program_transform_name = @program_transf - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target = @target@ - target_alias = @target_alias@ - target_cpu = @target_cpu@ - target_os = @target_os@ - target_vendor = @target_vendor@ -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - theoraincludedir = $(includedir)/theora - theorainclude_HEADERS = theora.h theoradec.h theoraenc.h codec.h - noinst_HEADERS = codec.h theoradec.h -@@ -246,9 +228,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_ - exit 1;; \ - esac; \ - done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/theora/Makefile'; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/theora/Makefile'; \ - cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign include/theora/Makefile -+ $(AUTOMAKE) --gnu include/theora/Makefile - .PRECIOUS: Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ -@@ -272,13 +254,9 @@ mostlyclean-libtool: - - clean-libtool: - -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --uninstall-info-am: - install-theoraincludeHEADERS: $(theorainclude_HEADERS) - @$(NORMAL_INSTALL) -- test -z "$(theoraincludedir)" || $(mkdir_p) "$(DESTDIR)$(theoraincludedir)" -+ test -z "$(theoraincludedir)" || $(MKDIR_P) "$(DESTDIR)$(theoraincludedir)" - @list='$(theorainclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ -@@ -299,8 +277,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -312,8 +290,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -323,13 +301,12 @@ ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - 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; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -343,22 +320,21 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - - distdir: $(DISTFILES) -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkdir_p) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -374,7 +350,7 @@ check: check-am - all-am: Makefile $(HEADERS) - installdirs: - for dir in "$(DESTDIR)$(theoraincludedir)"; do \ -- test -z "$$dir" || $(mkdir_p) "$$dir"; \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done - install: install-am - install-exec: install-exec-am -@@ -406,8 +382,7 @@ clean-am: clean-generic clean-libtool mo - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic distclean-libtool \ -- distclean-tags -+distclean-am: clean-am distclean-generic distclean-tags - - dvi: dvi-am - -@@ -421,12 +396,20 @@ info-am: - - install-data-am: install-theoraincludeHEADERS - -+install-dvi: install-dvi-am -+ - install-exec-am: - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -445,18 +428,22 @@ ps: ps-am - - ps-am: - --uninstall-am: uninstall-info-am uninstall-theoraincludeHEADERS -+uninstall-am: uninstall-theoraincludeHEADERS -+ -+.MAKE: install-am install-strip - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool ctags distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ -- install-data-am install-exec install-exec-am install-info \ -- install-info-am install-man install-strip \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-ps install-ps-am install-strip \ - install-theoraincludeHEADERS installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -- ps ps-am tags uninstall uninstall-am uninstall-info-am \ -+ ps ps-am tags uninstall uninstall-am \ - uninstall-theoraincludeHEADERS - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -Index: libtheora-1.0/lib/Makefile.in -=================================================================== ---- libtheora-1.0.orig/lib/Makefile.in -+++ libtheora-1.0/lib/Makefile.in -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.9.6 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 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,15 +15,11 @@ - @SET_MAKE@ - - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -43,9 +39,7 @@ DIST_COMMON = $(noinst_HEADERS) $(srcdir - $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ -- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/pkg.m4 \ -- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/vorbis.m4 \ -- $(top_srcdir)/configure.ac -+ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(install_sh) -d -@@ -107,6 +101,9 @@ am__objects_3 = apiwrapper.lo bitpack.lo - am_libtheora_la_OBJECTS = $(am__objects_2) $(am__objects_3) \ - $(am__objects_4) $(am__objects_5) - libtheora_la_OBJECTS = $(am_libtheora_la_OBJECTS) -+libtheora_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libtheora_la_LDFLAGS) $(LDFLAGS) -o $@ - libtheoradec_la_LIBADD = - am__libtheoradec_la_SOURCES_DIST = dec/x86/mmxidct.c dec/x86/mmxfrag.c \ - dec/x86/mmxstate.c dec/x86/x86state.c dec/apiwrapper.c \ -@@ -116,6 +113,9 @@ am__libtheoradec_la_SOURCES_DIST = dec/x - Version_script-dec - am_libtheoradec_la_OBJECTS = $(am__objects_2) $(am__objects_3) - libtheoradec_la_OBJECTS = $(am_libtheoradec_la_OBJECTS) -+libtheoradec_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libtheoradec_la_LDFLAGS) $(LDFLAGS) -o $@ - libtheoraenc_la_LIBADD = - am__libtheoraenc_la_SOURCES_DIST = $(enc_arch_dir)/dct_decode_mmx.c \ - $(enc_arch_dir)/dsp_mmx.c $(enc_arch_dir)/dsp_mmxext.c \ -@@ -129,17 +129,21 @@ am__libtheoraenc_la_SOURCES_DIST = $(enc - Version_script-enc - am_libtheoraenc_la_OBJECTS = $(am__objects_4) $(am__objects_5) - libtheoraenc_la_OBJECTS = $(am_libtheoraenc_la_OBJECTS) --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+libtheoraenc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libtheoraenc_la_LDFLAGS) $(LDFLAGS) -o $@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -- $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ - SOURCES = $(libtheora_la_SOURCES) $(libtheoradec_la_SOURCES) \ - $(libtheoraenc_la_SOURCES) - DIST_SOURCES = $(am__libtheora_la_SOURCES_DIST) \ -@@ -151,8 +155,6 @@ CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -162,17 +164,11 @@ AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ - BINDIR = @BINDIR@ - BUILDABLE_EXAMPLES = @BUILDABLE_EXAMPLES@ --BUILD_SPEC_FALSE = @BUILD_SPEC_FALSE@ --BUILD_SPEC_TRUE = @BUILD_SPEC_TRUE@ - CC = @CC@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CPU_x86_32_FALSE = @CPU_x86_32_FALSE@ --CPU_x86_32_TRUE = @CPU_x86_32_TRUE@ --CPU_x86_64_FALSE = @CPU_x86_64_FALSE@ --CPU_x86_64_TRUE = @CPU_x86_64_TRUE@ - CXX = @CXX@ - CXXCPP = @CXXCPP@ - CXXDEPMODE = @CXXDEPMODE@ -@@ -183,6 +179,7 @@ DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DOCDIR = @DOCDIR@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -195,13 +192,11 @@ GETOPT_OBJS = @GETOPT_OBJS@ - GREP = @GREP@ - HAVE_BIBTEX = @HAVE_BIBTEX@ - HAVE_DOXYGEN = @HAVE_DOXYGEN@ --HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ --HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ - HAVE_PDFLATEX = @HAVE_PDFLATEX@ --HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ - HAVE_TRANSFIG = @HAVE_TRANSFIG@ - HAVE_VALGRIND = @HAVE_VALGRIND@ - INCLUDEDIR = @INCLUDEDIR@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -214,13 +209,11 @@ LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OC_X86ASM_FALSE = @OC_X86ASM_FALSE@ --OC_X86ASM_TRUE = @OC_X86ASM_TRUE@ - OGG_CFLAGS = @OGG_CFLAGS@ - OGG_LIBS = @OGG_LIBS@ - PACKAGE = @PACKAGE@ -@@ -235,9 +228,12 @@ PNG_CFLAGS = @PNG_CFLAGS@ - PNG_LIBS = @PNG_LIBS@ - PROFILE = @PROFILE@ - RANLIB = @RANLIB@ -+REQUIRES_OGG = @REQUIRES_OGG@ -+REQUIRES_SDL = @REQUIRES_SDL@ -+REQUIRES_VORBIS = @REQUIRES_VORBIS@ - SDL_CFLAGS = @SDL_CFLAGS@ --SDL_CONFIG = @SDL_CONFIG@ - SDL_LIBS = @SDL_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -249,29 +245,21 @@ THENC_LIB_CURRENT = @THENC_LIB_CURRENT@ - THENC_LIB_REVISION = @THENC_LIB_REVISION@ - THEORADEC_LDFLAGS = @THEORADEC_LDFLAGS@ - THEORAENC_LDFLAGS = @THEORAENC_LDFLAGS@ --THEORA_DISABLE_ENCODE_FALSE = @THEORA_DISABLE_ENCODE_FALSE@ --THEORA_DISABLE_ENCODE_TRUE = @THEORA_DISABLE_ENCODE_TRUE@ --THEORA_DISABLE_FLOAT_FALSE = @THEORA_DISABLE_FLOAT_FALSE@ --THEORA_DISABLE_FLOAT_TRUE = @THEORA_DISABLE_FLOAT_TRUE@ --THEORA_ENABLE_EXAMPLES_FALSE = @THEORA_ENABLE_EXAMPLES_FALSE@ --THEORA_ENABLE_EXAMPLES_TRUE = @THEORA_ENABLE_EXAMPLES_TRUE@ - THEORA_LDFLAGS = @THEORA_LDFLAGS@ - TH_LIB_AGE = @TH_LIB_AGE@ - TH_LIB_CURRENT = @TH_LIB_CURRENT@ - TH_LIB_REVISION = @TH_LIB_REVISION@ - VALGRIND_ENVIRONMENT = @VALGRIND_ENVIRONMENT@ - VERSION = @VERSION@ --VORBISENC_LIBS = @VORBISENC_LIBS@ --VORBISFILE_LIBS = @VORBISFILE_LIBS@ - VORBIS_CFLAGS = @VORBIS_CFLAGS@ - VORBIS_LIBS = @VORBIS_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -@@ -283,6 +271,7 @@ build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -310,12 +299,15 @@ program_transform_name = @program_transf - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target = @target@ - target_alias = @target_alias@ - target_cpu = @target_cpu@ - target_os = @target_os@ - target_vendor = @target_vendor@ -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - INCLUDES = -I$(top_srcdir)/include - AM_CFLAGS = $(OGG_CFLAGS) - EXTRA_DIST = \ -@@ -474,9 +466,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_ - exit 1;; \ - esac; \ - done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/Makefile'; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile'; \ - cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign lib/Makefile -+ $(AUTOMAKE) --gnu lib/Makefile - .PRECIOUS: Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ -@@ -496,21 +488,21 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $( - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" -+ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ - else :; fi; \ - done - - uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) -- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ -+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ - done - - clean-libLTLIBRARIES: -@@ -522,11 +514,11 @@ clean-libLTLIBRARIES: - rm -f "$${dir}/so_locations"; \ - done - libtheora.la: $(libtheora_la_OBJECTS) $(libtheora_la_DEPENDENCIES) -- $(LINK) -rpath $(libdir) $(libtheora_la_LDFLAGS) $(libtheora_la_OBJECTS) $(libtheora_la_LIBADD) $(LIBS) -+ $(libtheora_la_LINK) -rpath $(libdir) $(libtheora_la_OBJECTS) $(libtheora_la_LIBADD) $(LIBS) - libtheoradec.la: $(libtheoradec_la_OBJECTS) $(libtheoradec_la_DEPENDENCIES) -- $(LINK) -rpath $(libdir) $(libtheoradec_la_LDFLAGS) $(libtheoradec_la_OBJECTS) $(libtheoradec_la_LIBADD) $(LIBS) -+ $(libtheoradec_la_LINK) -rpath $(libdir) $(libtheoradec_la_OBJECTS) $(libtheoradec_la_LIBADD) $(LIBS) - libtheoraenc.la: $(libtheoraenc_la_OBJECTS) $(libtheoraenc_la_DEPENDENCIES) -- $(LINK) -rpath $(libdir) $(libtheoraenc_la_LDFLAGS) $(libtheoraenc_la_OBJECTS) $(libtheoraenc_la_LIBADD) $(LIBS) -+ $(libtheoraenc_la_LINK) -rpath $(libdir) $(libtheoraenc_la_OBJECTS) $(libtheoraenc_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -579,326 +571,326 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/x86state.Plo@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(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@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ mv -f $(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@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(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 $@ $< - - mmxidct.lo: dec/x86/mmxidct.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mmxidct.lo -MD -MP -MF "$(DEPDIR)/mmxidct.Tpo" -c -o mmxidct.lo `test -f 'dec/x86/mmxidct.c' || echo '$(srcdir)/'`dec/x86/mmxidct.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mmxidct.Tpo" "$(DEPDIR)/mmxidct.Plo"; else rm -f "$(DEPDIR)/mmxidct.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mmxidct.lo -MD -MP -MF $(DEPDIR)/mmxidct.Tpo -c -o mmxidct.lo `test -f 'dec/x86/mmxidct.c' || echo '$(srcdir)/'`dec/x86/mmxidct.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mmxidct.Tpo $(DEPDIR)/mmxidct.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dec/x86/mmxidct.c' object='mmxidct.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mmxidct.lo `test -f 'dec/x86/mmxidct.c' || echo '$(srcdir)/'`dec/x86/mmxidct.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mmxidct.lo `test -f 'dec/x86/mmxidct.c' || echo '$(srcdir)/'`dec/x86/mmxidct.c - - mmxfrag.lo: dec/x86/mmxfrag.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mmxfrag.lo -MD -MP -MF "$(DEPDIR)/mmxfrag.Tpo" -c -o mmxfrag.lo `test -f 'dec/x86/mmxfrag.c' || echo '$(srcdir)/'`dec/x86/mmxfrag.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mmxfrag.Tpo" "$(DEPDIR)/mmxfrag.Plo"; else rm -f "$(DEPDIR)/mmxfrag.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mmxfrag.lo -MD -MP -MF $(DEPDIR)/mmxfrag.Tpo -c -o mmxfrag.lo `test -f 'dec/x86/mmxfrag.c' || echo '$(srcdir)/'`dec/x86/mmxfrag.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mmxfrag.Tpo $(DEPDIR)/mmxfrag.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dec/x86/mmxfrag.c' object='mmxfrag.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mmxfrag.lo `test -f 'dec/x86/mmxfrag.c' || echo '$(srcdir)/'`dec/x86/mmxfrag.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mmxfrag.lo `test -f 'dec/x86/mmxfrag.c' || echo '$(srcdir)/'`dec/x86/mmxfrag.c - - mmxstate.lo: dec/x86/mmxstate.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mmxstate.lo -MD -MP -MF "$(DEPDIR)/mmxstate.Tpo" -c -o mmxstate.lo `test -f 'dec/x86/mmxstate.c' || echo '$(srcdir)/'`dec/x86/mmxstate.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mmxstate.Tpo" "$(DEPDIR)/mmxstate.Plo"; else rm -f "$(DEPDIR)/mmxstate.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mmxstate.lo -MD -MP -MF $(DEPDIR)/mmxstate.Tpo -c -o mmxstate.lo `test -f 'dec/x86/mmxstate.c' || echo '$(srcdir)/'`dec/x86/mmxstate.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mmxstate.Tpo $(DEPDIR)/mmxstate.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dec/x86/mmxstate.c' object='mmxstate.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mmxstate.lo `test -f 'dec/x86/mmxstate.c' || echo '$(srcdir)/'`dec/x86/mmxstate.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mmxstate.lo `test -f 'dec/x86/mmxstate.c' || echo '$(srcdir)/'`dec/x86/mmxstate.c - - x86state.lo: dec/x86/x86state.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT x86state.lo -MD -MP -MF "$(DEPDIR)/x86state.Tpo" -c -o x86state.lo `test -f 'dec/x86/x86state.c' || echo '$(srcdir)/'`dec/x86/x86state.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/x86state.Tpo" "$(DEPDIR)/x86state.Plo"; else rm -f "$(DEPDIR)/x86state.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT x86state.lo -MD -MP -MF $(DEPDIR)/x86state.Tpo -c -o x86state.lo `test -f 'dec/x86/x86state.c' || echo '$(srcdir)/'`dec/x86/x86state.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/x86state.Tpo $(DEPDIR)/x86state.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dec/x86/x86state.c' object='x86state.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o x86state.lo `test -f 'dec/x86/x86state.c' || echo '$(srcdir)/'`dec/x86/x86state.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o x86state.lo `test -f 'dec/x86/x86state.c' || echo '$(srcdir)/'`dec/x86/x86state.c - - apiwrapper.lo: dec/apiwrapper.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT apiwrapper.lo -MD -MP -MF "$(DEPDIR)/apiwrapper.Tpo" -c -o apiwrapper.lo `test -f 'dec/apiwrapper.c' || echo '$(srcdir)/'`dec/apiwrapper.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/apiwrapper.Tpo" "$(DEPDIR)/apiwrapper.Plo"; else rm -f "$(DEPDIR)/apiwrapper.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT apiwrapper.lo -MD -MP -MF $(DEPDIR)/apiwrapper.Tpo -c -o apiwrapper.lo `test -f 'dec/apiwrapper.c' || echo '$(srcdir)/'`dec/apiwrapper.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/apiwrapper.Tpo $(DEPDIR)/apiwrapper.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dec/apiwrapper.c' object='apiwrapper.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o apiwrapper.lo `test -f 'dec/apiwrapper.c' || echo '$(srcdir)/'`dec/apiwrapper.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o apiwrapper.lo `test -f 'dec/apiwrapper.c' || echo '$(srcdir)/'`dec/apiwrapper.c - - bitpack.lo: dec/bitpack.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT bitpack.lo -MD -MP -MF "$(DEPDIR)/bitpack.Tpo" -c -o bitpack.lo `test -f 'dec/bitpack.c' || echo '$(srcdir)/'`dec/bitpack.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/bitpack.Tpo" "$(DEPDIR)/bitpack.Plo"; else rm -f "$(DEPDIR)/bitpack.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT bitpack.lo -MD -MP -MF $(DEPDIR)/bitpack.Tpo -c -o bitpack.lo `test -f 'dec/bitpack.c' || echo '$(srcdir)/'`dec/bitpack.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/bitpack.Tpo $(DEPDIR)/bitpack.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dec/bitpack.c' object='bitpack.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bitpack.lo `test -f 'dec/bitpack.c' || echo '$(srcdir)/'`dec/bitpack.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bitpack.lo `test -f 'dec/bitpack.c' || echo '$(srcdir)/'`dec/bitpack.c - - decapiwrapper.lo: dec/decapiwrapper.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT decapiwrapper.lo -MD -MP -MF "$(DEPDIR)/decapiwrapper.Tpo" -c -o decapiwrapper.lo `test -f 'dec/decapiwrapper.c' || echo '$(srcdir)/'`dec/decapiwrapper.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/decapiwrapper.Tpo" "$(DEPDIR)/decapiwrapper.Plo"; else rm -f "$(DEPDIR)/decapiwrapper.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT decapiwrapper.lo -MD -MP -MF $(DEPDIR)/decapiwrapper.Tpo -c -o decapiwrapper.lo `test -f 'dec/decapiwrapper.c' || echo '$(srcdir)/'`dec/decapiwrapper.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/decapiwrapper.Tpo $(DEPDIR)/decapiwrapper.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dec/decapiwrapper.c' object='decapiwrapper.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o decapiwrapper.lo `test -f 'dec/decapiwrapper.c' || echo '$(srcdir)/'`dec/decapiwrapper.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o decapiwrapper.lo `test -f 'dec/decapiwrapper.c' || echo '$(srcdir)/'`dec/decapiwrapper.c - - decinfo.lo: dec/decinfo.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT decinfo.lo -MD -MP -MF "$(DEPDIR)/decinfo.Tpo" -c -o decinfo.lo `test -f 'dec/decinfo.c' || echo '$(srcdir)/'`dec/decinfo.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/decinfo.Tpo" "$(DEPDIR)/decinfo.Plo"; else rm -f "$(DEPDIR)/decinfo.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT decinfo.lo -MD -MP -MF $(DEPDIR)/decinfo.Tpo -c -o decinfo.lo `test -f 'dec/decinfo.c' || echo '$(srcdir)/'`dec/decinfo.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/decinfo.Tpo $(DEPDIR)/decinfo.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dec/decinfo.c' object='decinfo.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o decinfo.lo `test -f 'dec/decinfo.c' || echo '$(srcdir)/'`dec/decinfo.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o decinfo.lo `test -f 'dec/decinfo.c' || echo '$(srcdir)/'`dec/decinfo.c - - decode.lo: dec/decode.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT decode.lo -MD -MP -MF "$(DEPDIR)/decode.Tpo" -c -o decode.lo `test -f 'dec/decode.c' || echo '$(srcdir)/'`dec/decode.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/decode.Tpo" "$(DEPDIR)/decode.Plo"; else rm -f "$(DEPDIR)/decode.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT decode.lo -MD -MP -MF $(DEPDIR)/decode.Tpo -c -o decode.lo `test -f 'dec/decode.c' || echo '$(srcdir)/'`dec/decode.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/decode.Tpo $(DEPDIR)/decode.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dec/decode.c' object='decode.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o decode.lo `test -f 'dec/decode.c' || echo '$(srcdir)/'`dec/decode.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o decode.lo `test -f 'dec/decode.c' || echo '$(srcdir)/'`dec/decode.c - - dequant.lo: dec/dequant.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dequant.lo -MD -MP -MF "$(DEPDIR)/dequant.Tpo" -c -o dequant.lo `test -f 'dec/dequant.c' || echo '$(srcdir)/'`dec/dequant.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/dequant.Tpo" "$(DEPDIR)/dequant.Plo"; else rm -f "$(DEPDIR)/dequant.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dequant.lo -MD -MP -MF $(DEPDIR)/dequant.Tpo -c -o dequant.lo `test -f 'dec/dequant.c' || echo '$(srcdir)/'`dec/dequant.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/dequant.Tpo $(DEPDIR)/dequant.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dec/dequant.c' object='dequant.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dequant.lo `test -f 'dec/dequant.c' || echo '$(srcdir)/'`dec/dequant.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dequant.lo `test -f 'dec/dequant.c' || echo '$(srcdir)/'`dec/dequant.c - - fragment.lo: dec/fragment.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fragment.lo -MD -MP -MF "$(DEPDIR)/fragment.Tpo" -c -o fragment.lo `test -f 'dec/fragment.c' || echo '$(srcdir)/'`dec/fragment.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/fragment.Tpo" "$(DEPDIR)/fragment.Plo"; else rm -f "$(DEPDIR)/fragment.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fragment.lo -MD -MP -MF $(DEPDIR)/fragment.Tpo -c -o fragment.lo `test -f 'dec/fragment.c' || echo '$(srcdir)/'`dec/fragment.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/fragment.Tpo $(DEPDIR)/fragment.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dec/fragment.c' object='fragment.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fragment.lo `test -f 'dec/fragment.c' || echo '$(srcdir)/'`dec/fragment.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fragment.lo `test -f 'dec/fragment.c' || echo '$(srcdir)/'`dec/fragment.c - - huffdec.lo: dec/huffdec.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT huffdec.lo -MD -MP -MF "$(DEPDIR)/huffdec.Tpo" -c -o huffdec.lo `test -f 'dec/huffdec.c' || echo '$(srcdir)/'`dec/huffdec.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/huffdec.Tpo" "$(DEPDIR)/huffdec.Plo"; else rm -f "$(DEPDIR)/huffdec.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT huffdec.lo -MD -MP -MF $(DEPDIR)/huffdec.Tpo -c -o huffdec.lo `test -f 'dec/huffdec.c' || echo '$(srcdir)/'`dec/huffdec.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/huffdec.Tpo $(DEPDIR)/huffdec.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dec/huffdec.c' object='huffdec.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o huffdec.lo `test -f 'dec/huffdec.c' || echo '$(srcdir)/'`dec/huffdec.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o huffdec.lo `test -f 'dec/huffdec.c' || echo '$(srcdir)/'`dec/huffdec.c - - idct.lo: dec/idct.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT idct.lo -MD -MP -MF "$(DEPDIR)/idct.Tpo" -c -o idct.lo `test -f 'dec/idct.c' || echo '$(srcdir)/'`dec/idct.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/idct.Tpo" "$(DEPDIR)/idct.Plo"; else rm -f "$(DEPDIR)/idct.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT idct.lo -MD -MP -MF $(DEPDIR)/idct.Tpo -c -o idct.lo `test -f 'dec/idct.c' || echo '$(srcdir)/'`dec/idct.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/idct.Tpo $(DEPDIR)/idct.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dec/idct.c' object='idct.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o idct.lo `test -f 'dec/idct.c' || echo '$(srcdir)/'`dec/idct.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o idct.lo `test -f 'dec/idct.c' || echo '$(srcdir)/'`dec/idct.c - - info.lo: dec/info.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT info.lo -MD -MP -MF "$(DEPDIR)/info.Tpo" -c -o info.lo `test -f 'dec/info.c' || echo '$(srcdir)/'`dec/info.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/info.Tpo" "$(DEPDIR)/info.Plo"; else rm -f "$(DEPDIR)/info.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT info.lo -MD -MP -MF $(DEPDIR)/info.Tpo -c -o info.lo `test -f 'dec/info.c' || echo '$(srcdir)/'`dec/info.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/info.Tpo $(DEPDIR)/info.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dec/info.c' object='info.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o info.lo `test -f 'dec/info.c' || echo '$(srcdir)/'`dec/info.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o info.lo `test -f 'dec/info.c' || echo '$(srcdir)/'`dec/info.c - - internal.lo: dec/internal.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT internal.lo -MD -MP -MF "$(DEPDIR)/internal.Tpo" -c -o internal.lo `test -f 'dec/internal.c' || echo '$(srcdir)/'`dec/internal.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/internal.Tpo" "$(DEPDIR)/internal.Plo"; else rm -f "$(DEPDIR)/internal.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT internal.lo -MD -MP -MF $(DEPDIR)/internal.Tpo -c -o internal.lo `test -f 'dec/internal.c' || echo '$(srcdir)/'`dec/internal.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/internal.Tpo $(DEPDIR)/internal.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dec/internal.c' object='internal.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o internal.lo `test -f 'dec/internal.c' || echo '$(srcdir)/'`dec/internal.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o internal.lo `test -f 'dec/internal.c' || echo '$(srcdir)/'`dec/internal.c - - quant.lo: dec/quant.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT quant.lo -MD -MP -MF "$(DEPDIR)/quant.Tpo" -c -o quant.lo `test -f 'dec/quant.c' || echo '$(srcdir)/'`dec/quant.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/quant.Tpo" "$(DEPDIR)/quant.Plo"; else rm -f "$(DEPDIR)/quant.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT quant.lo -MD -MP -MF $(DEPDIR)/quant.Tpo -c -o quant.lo `test -f 'dec/quant.c' || echo '$(srcdir)/'`dec/quant.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/quant.Tpo $(DEPDIR)/quant.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dec/quant.c' object='quant.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o quant.lo `test -f 'dec/quant.c' || echo '$(srcdir)/'`dec/quant.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o quant.lo `test -f 'dec/quant.c' || echo '$(srcdir)/'`dec/quant.c - - state.lo: dec/state.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT state.lo -MD -MP -MF "$(DEPDIR)/state.Tpo" -c -o state.lo `test -f 'dec/state.c' || echo '$(srcdir)/'`dec/state.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/state.Tpo" "$(DEPDIR)/state.Plo"; else rm -f "$(DEPDIR)/state.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT state.lo -MD -MP -MF $(DEPDIR)/state.Tpo -c -o state.lo `test -f 'dec/state.c' || echo '$(srcdir)/'`dec/state.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/state.Tpo $(DEPDIR)/state.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dec/state.c' object='state.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o state.lo `test -f 'dec/state.c' || echo '$(srcdir)/'`dec/state.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o state.lo `test -f 'dec/state.c' || echo '$(srcdir)/'`dec/state.c - - dct_decode_mmx.lo: $(enc_arch_dir)/dct_decode_mmx.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dct_decode_mmx.lo -MD -MP -MF "$(DEPDIR)/dct_decode_mmx.Tpo" -c -o dct_decode_mmx.lo `test -f '$(enc_arch_dir)/dct_decode_mmx.c' || echo '$(srcdir)/'`$(enc_arch_dir)/dct_decode_mmx.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/dct_decode_mmx.Tpo" "$(DEPDIR)/dct_decode_mmx.Plo"; else rm -f "$(DEPDIR)/dct_decode_mmx.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dct_decode_mmx.lo -MD -MP -MF $(DEPDIR)/dct_decode_mmx.Tpo -c -o dct_decode_mmx.lo `test -f '$(enc_arch_dir)/dct_decode_mmx.c' || echo '$(srcdir)/'`$(enc_arch_dir)/dct_decode_mmx.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/dct_decode_mmx.Tpo $(DEPDIR)/dct_decode_mmx.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(enc_arch_dir)/dct_decode_mmx.c' object='dct_decode_mmx.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dct_decode_mmx.lo `test -f '$(enc_arch_dir)/dct_decode_mmx.c' || echo '$(srcdir)/'`$(enc_arch_dir)/dct_decode_mmx.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dct_decode_mmx.lo `test -f '$(enc_arch_dir)/dct_decode_mmx.c' || echo '$(srcdir)/'`$(enc_arch_dir)/dct_decode_mmx.c - - dsp_mmx.lo: $(enc_arch_dir)/dsp_mmx.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dsp_mmx.lo -MD -MP -MF "$(DEPDIR)/dsp_mmx.Tpo" -c -o dsp_mmx.lo `test -f '$(enc_arch_dir)/dsp_mmx.c' || echo '$(srcdir)/'`$(enc_arch_dir)/dsp_mmx.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/dsp_mmx.Tpo" "$(DEPDIR)/dsp_mmx.Plo"; else rm -f "$(DEPDIR)/dsp_mmx.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dsp_mmx.lo -MD -MP -MF $(DEPDIR)/dsp_mmx.Tpo -c -o dsp_mmx.lo `test -f '$(enc_arch_dir)/dsp_mmx.c' || echo '$(srcdir)/'`$(enc_arch_dir)/dsp_mmx.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/dsp_mmx.Tpo $(DEPDIR)/dsp_mmx.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(enc_arch_dir)/dsp_mmx.c' object='dsp_mmx.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dsp_mmx.lo `test -f '$(enc_arch_dir)/dsp_mmx.c' || echo '$(srcdir)/'`$(enc_arch_dir)/dsp_mmx.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dsp_mmx.lo `test -f '$(enc_arch_dir)/dsp_mmx.c' || echo '$(srcdir)/'`$(enc_arch_dir)/dsp_mmx.c - - dsp_mmxext.lo: $(enc_arch_dir)/dsp_mmxext.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dsp_mmxext.lo -MD -MP -MF "$(DEPDIR)/dsp_mmxext.Tpo" -c -o dsp_mmxext.lo `test -f '$(enc_arch_dir)/dsp_mmxext.c' || echo '$(srcdir)/'`$(enc_arch_dir)/dsp_mmxext.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/dsp_mmxext.Tpo" "$(DEPDIR)/dsp_mmxext.Plo"; else rm -f "$(DEPDIR)/dsp_mmxext.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dsp_mmxext.lo -MD -MP -MF $(DEPDIR)/dsp_mmxext.Tpo -c -o dsp_mmxext.lo `test -f '$(enc_arch_dir)/dsp_mmxext.c' || echo '$(srcdir)/'`$(enc_arch_dir)/dsp_mmxext.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/dsp_mmxext.Tpo $(DEPDIR)/dsp_mmxext.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(enc_arch_dir)/dsp_mmxext.c' object='dsp_mmxext.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dsp_mmxext.lo `test -f '$(enc_arch_dir)/dsp_mmxext.c' || echo '$(srcdir)/'`$(enc_arch_dir)/dsp_mmxext.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dsp_mmxext.lo `test -f '$(enc_arch_dir)/dsp_mmxext.c' || echo '$(srcdir)/'`$(enc_arch_dir)/dsp_mmxext.c - - recon_mmx.lo: $(enc_arch_dir)/recon_mmx.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT recon_mmx.lo -MD -MP -MF "$(DEPDIR)/recon_mmx.Tpo" -c -o recon_mmx.lo `test -f '$(enc_arch_dir)/recon_mmx.c' || echo '$(srcdir)/'`$(enc_arch_dir)/recon_mmx.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/recon_mmx.Tpo" "$(DEPDIR)/recon_mmx.Plo"; else rm -f "$(DEPDIR)/recon_mmx.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT recon_mmx.lo -MD -MP -MF $(DEPDIR)/recon_mmx.Tpo -c -o recon_mmx.lo `test -f '$(enc_arch_dir)/recon_mmx.c' || echo '$(srcdir)/'`$(enc_arch_dir)/recon_mmx.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/recon_mmx.Tpo $(DEPDIR)/recon_mmx.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(enc_arch_dir)/recon_mmx.c' object='recon_mmx.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o recon_mmx.lo `test -f '$(enc_arch_dir)/recon_mmx.c' || echo '$(srcdir)/'`$(enc_arch_dir)/recon_mmx.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o recon_mmx.lo `test -f '$(enc_arch_dir)/recon_mmx.c' || echo '$(srcdir)/'`$(enc_arch_dir)/recon_mmx.c - - idct_mmx.lo: $(enc_arch_dir)/idct_mmx.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT idct_mmx.lo -MD -MP -MF "$(DEPDIR)/idct_mmx.Tpo" -c -o idct_mmx.lo `test -f '$(enc_arch_dir)/idct_mmx.c' || echo '$(srcdir)/'`$(enc_arch_dir)/idct_mmx.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/idct_mmx.Tpo" "$(DEPDIR)/idct_mmx.Plo"; else rm -f "$(DEPDIR)/idct_mmx.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT idct_mmx.lo -MD -MP -MF $(DEPDIR)/idct_mmx.Tpo -c -o idct_mmx.lo `test -f '$(enc_arch_dir)/idct_mmx.c' || echo '$(srcdir)/'`$(enc_arch_dir)/idct_mmx.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/idct_mmx.Tpo $(DEPDIR)/idct_mmx.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(enc_arch_dir)/idct_mmx.c' object='idct_mmx.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o idct_mmx.lo `test -f '$(enc_arch_dir)/idct_mmx.c' || echo '$(srcdir)/'`$(enc_arch_dir)/idct_mmx.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o idct_mmx.lo `test -f '$(enc_arch_dir)/idct_mmx.c' || echo '$(srcdir)/'`$(enc_arch_dir)/idct_mmx.c - - fdct_mmx.lo: $(enc_arch_dir)/fdct_mmx.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fdct_mmx.lo -MD -MP -MF "$(DEPDIR)/fdct_mmx.Tpo" -c -o fdct_mmx.lo `test -f '$(enc_arch_dir)/fdct_mmx.c' || echo '$(srcdir)/'`$(enc_arch_dir)/fdct_mmx.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/fdct_mmx.Tpo" "$(DEPDIR)/fdct_mmx.Plo"; else rm -f "$(DEPDIR)/fdct_mmx.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fdct_mmx.lo -MD -MP -MF $(DEPDIR)/fdct_mmx.Tpo -c -o fdct_mmx.lo `test -f '$(enc_arch_dir)/fdct_mmx.c' || echo '$(srcdir)/'`$(enc_arch_dir)/fdct_mmx.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/fdct_mmx.Tpo $(DEPDIR)/fdct_mmx.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(enc_arch_dir)/fdct_mmx.c' object='fdct_mmx.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fdct_mmx.lo `test -f '$(enc_arch_dir)/fdct_mmx.c' || echo '$(srcdir)/'`$(enc_arch_dir)/fdct_mmx.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fdct_mmx.lo `test -f '$(enc_arch_dir)/fdct_mmx.c' || echo '$(srcdir)/'`$(enc_arch_dir)/fdct_mmx.c - - dct_encode.lo: enc/dct_encode.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dct_encode.lo -MD -MP -MF "$(DEPDIR)/dct_encode.Tpo" -c -o dct_encode.lo `test -f 'enc/dct_encode.c' || echo '$(srcdir)/'`enc/dct_encode.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/dct_encode.Tpo" "$(DEPDIR)/dct_encode.Plo"; else rm -f "$(DEPDIR)/dct_encode.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dct_encode.lo -MD -MP -MF $(DEPDIR)/dct_encode.Tpo -c -o dct_encode.lo `test -f 'enc/dct_encode.c' || echo '$(srcdir)/'`enc/dct_encode.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/dct_encode.Tpo $(DEPDIR)/dct_encode.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='enc/dct_encode.c' object='dct_encode.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dct_encode.lo `test -f 'enc/dct_encode.c' || echo '$(srcdir)/'`enc/dct_encode.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dct_encode.lo `test -f 'enc/dct_encode.c' || echo '$(srcdir)/'`enc/dct_encode.c - - encode.lo: enc/encode.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT encode.lo -MD -MP -MF "$(DEPDIR)/encode.Tpo" -c -o encode.lo `test -f 'enc/encode.c' || echo '$(srcdir)/'`enc/encode.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/encode.Tpo" "$(DEPDIR)/encode.Plo"; else rm -f "$(DEPDIR)/encode.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT encode.lo -MD -MP -MF $(DEPDIR)/encode.Tpo -c -o encode.lo `test -f 'enc/encode.c' || echo '$(srcdir)/'`enc/encode.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/encode.Tpo $(DEPDIR)/encode.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='enc/encode.c' object='encode.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o encode.lo `test -f 'enc/encode.c' || echo '$(srcdir)/'`enc/encode.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o encode.lo `test -f 'enc/encode.c' || echo '$(srcdir)/'`enc/encode.c - - encoder_huffman.lo: enc/encoder_huffman.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT encoder_huffman.lo -MD -MP -MF "$(DEPDIR)/encoder_huffman.Tpo" -c -o encoder_huffman.lo `test -f 'enc/encoder_huffman.c' || echo '$(srcdir)/'`enc/encoder_huffman.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/encoder_huffman.Tpo" "$(DEPDIR)/encoder_huffman.Plo"; else rm -f "$(DEPDIR)/encoder_huffman.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT encoder_huffman.lo -MD -MP -MF $(DEPDIR)/encoder_huffman.Tpo -c -o encoder_huffman.lo `test -f 'enc/encoder_huffman.c' || echo '$(srcdir)/'`enc/encoder_huffman.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/encoder_huffman.Tpo $(DEPDIR)/encoder_huffman.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='enc/encoder_huffman.c' object='encoder_huffman.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o encoder_huffman.lo `test -f 'enc/encoder_huffman.c' || echo '$(srcdir)/'`enc/encoder_huffman.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o encoder_huffman.lo `test -f 'enc/encoder_huffman.c' || echo '$(srcdir)/'`enc/encoder_huffman.c - - encoder_idct.lo: enc/encoder_idct.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT encoder_idct.lo -MD -MP -MF "$(DEPDIR)/encoder_idct.Tpo" -c -o encoder_idct.lo `test -f 'enc/encoder_idct.c' || echo '$(srcdir)/'`enc/encoder_idct.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/encoder_idct.Tpo" "$(DEPDIR)/encoder_idct.Plo"; else rm -f "$(DEPDIR)/encoder_idct.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT encoder_idct.lo -MD -MP -MF $(DEPDIR)/encoder_idct.Tpo -c -o encoder_idct.lo `test -f 'enc/encoder_idct.c' || echo '$(srcdir)/'`enc/encoder_idct.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/encoder_idct.Tpo $(DEPDIR)/encoder_idct.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='enc/encoder_idct.c' object='encoder_idct.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o encoder_idct.lo `test -f 'enc/encoder_idct.c' || echo '$(srcdir)/'`enc/encoder_idct.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o encoder_idct.lo `test -f 'enc/encoder_idct.c' || echo '$(srcdir)/'`enc/encoder_idct.c - - encoder_toplevel.lo: enc/encoder_toplevel.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT encoder_toplevel.lo -MD -MP -MF "$(DEPDIR)/encoder_toplevel.Tpo" -c -o encoder_toplevel.lo `test -f 'enc/encoder_toplevel.c' || echo '$(srcdir)/'`enc/encoder_toplevel.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/encoder_toplevel.Tpo" "$(DEPDIR)/encoder_toplevel.Plo"; else rm -f "$(DEPDIR)/encoder_toplevel.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT encoder_toplevel.lo -MD -MP -MF $(DEPDIR)/encoder_toplevel.Tpo -c -o encoder_toplevel.lo `test -f 'enc/encoder_toplevel.c' || echo '$(srcdir)/'`enc/encoder_toplevel.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/encoder_toplevel.Tpo $(DEPDIR)/encoder_toplevel.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='enc/encoder_toplevel.c' object='encoder_toplevel.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o encoder_toplevel.lo `test -f 'enc/encoder_toplevel.c' || echo '$(srcdir)/'`enc/encoder_toplevel.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o encoder_toplevel.lo `test -f 'enc/encoder_toplevel.c' || echo '$(srcdir)/'`enc/encoder_toplevel.c - - encoder_quant.lo: enc/encoder_quant.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT encoder_quant.lo -MD -MP -MF "$(DEPDIR)/encoder_quant.Tpo" -c -o encoder_quant.lo `test -f 'enc/encoder_quant.c' || echo '$(srcdir)/'`enc/encoder_quant.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/encoder_quant.Tpo" "$(DEPDIR)/encoder_quant.Plo"; else rm -f "$(DEPDIR)/encoder_quant.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT encoder_quant.lo -MD -MP -MF $(DEPDIR)/encoder_quant.Tpo -c -o encoder_quant.lo `test -f 'enc/encoder_quant.c' || echo '$(srcdir)/'`enc/encoder_quant.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/encoder_quant.Tpo $(DEPDIR)/encoder_quant.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='enc/encoder_quant.c' object='encoder_quant.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o encoder_quant.lo `test -f 'enc/encoder_quant.c' || echo '$(srcdir)/'`enc/encoder_quant.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o encoder_quant.lo `test -f 'enc/encoder_quant.c' || echo '$(srcdir)/'`enc/encoder_quant.c - - encapiwrapper.lo: enc/encapiwrapper.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT encapiwrapper.lo -MD -MP -MF "$(DEPDIR)/encapiwrapper.Tpo" -c -o encapiwrapper.lo `test -f 'enc/encapiwrapper.c' || echo '$(srcdir)/'`enc/encapiwrapper.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/encapiwrapper.Tpo" "$(DEPDIR)/encapiwrapper.Plo"; else rm -f "$(DEPDIR)/encapiwrapper.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT encapiwrapper.lo -MD -MP -MF $(DEPDIR)/encapiwrapper.Tpo -c -o encapiwrapper.lo `test -f 'enc/encapiwrapper.c' || echo '$(srcdir)/'`enc/encapiwrapper.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/encapiwrapper.Tpo $(DEPDIR)/encapiwrapper.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='enc/encapiwrapper.c' object='encapiwrapper.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o encapiwrapper.lo `test -f 'enc/encapiwrapper.c' || echo '$(srcdir)/'`enc/encapiwrapper.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o encapiwrapper.lo `test -f 'enc/encapiwrapper.c' || echo '$(srcdir)/'`enc/encapiwrapper.c - - blockmap.lo: enc/blockmap.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT blockmap.lo -MD -MP -MF "$(DEPDIR)/blockmap.Tpo" -c -o blockmap.lo `test -f 'enc/blockmap.c' || echo '$(srcdir)/'`enc/blockmap.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/blockmap.Tpo" "$(DEPDIR)/blockmap.Plo"; else rm -f "$(DEPDIR)/blockmap.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT blockmap.lo -MD -MP -MF $(DEPDIR)/blockmap.Tpo -c -o blockmap.lo `test -f 'enc/blockmap.c' || echo '$(srcdir)/'`enc/blockmap.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/blockmap.Tpo $(DEPDIR)/blockmap.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='enc/blockmap.c' object='blockmap.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o blockmap.lo `test -f 'enc/blockmap.c' || echo '$(srcdir)/'`enc/blockmap.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o blockmap.lo `test -f 'enc/blockmap.c' || echo '$(srcdir)/'`enc/blockmap.c - - dct.lo: enc/dct.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dct.lo -MD -MP -MF "$(DEPDIR)/dct.Tpo" -c -o dct.lo `test -f 'enc/dct.c' || echo '$(srcdir)/'`enc/dct.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/dct.Tpo" "$(DEPDIR)/dct.Plo"; else rm -f "$(DEPDIR)/dct.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dct.lo -MD -MP -MF $(DEPDIR)/dct.Tpo -c -o dct.lo `test -f 'enc/dct.c' || echo '$(srcdir)/'`enc/dct.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/dct.Tpo $(DEPDIR)/dct.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='enc/dct.c' object='dct.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dct.lo `test -f 'enc/dct.c' || echo '$(srcdir)/'`enc/dct.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dct.lo `test -f 'enc/dct.c' || echo '$(srcdir)/'`enc/dct.c - - dct_decode.lo: enc/dct_decode.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dct_decode.lo -MD -MP -MF "$(DEPDIR)/dct_decode.Tpo" -c -o dct_decode.lo `test -f 'enc/dct_decode.c' || echo '$(srcdir)/'`enc/dct_decode.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/dct_decode.Tpo" "$(DEPDIR)/dct_decode.Plo"; else rm -f "$(DEPDIR)/dct_decode.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dct_decode.lo -MD -MP -MF $(DEPDIR)/dct_decode.Tpo -c -o dct_decode.lo `test -f 'enc/dct_decode.c' || echo '$(srcdir)/'`enc/dct_decode.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/dct_decode.Tpo $(DEPDIR)/dct_decode.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='enc/dct_decode.c' object='dct_decode.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dct_decode.lo `test -f 'enc/dct_decode.c' || echo '$(srcdir)/'`enc/dct_decode.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dct_decode.lo `test -f 'enc/dct_decode.c' || echo '$(srcdir)/'`enc/dct_decode.c - - frarray.lo: enc/frarray.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT frarray.lo -MD -MP -MF "$(DEPDIR)/frarray.Tpo" -c -o frarray.lo `test -f 'enc/frarray.c' || echo '$(srcdir)/'`enc/frarray.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/frarray.Tpo" "$(DEPDIR)/frarray.Plo"; else rm -f "$(DEPDIR)/frarray.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT frarray.lo -MD -MP -MF $(DEPDIR)/frarray.Tpo -c -o frarray.lo `test -f 'enc/frarray.c' || echo '$(srcdir)/'`enc/frarray.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/frarray.Tpo $(DEPDIR)/frarray.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='enc/frarray.c' object='frarray.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o frarray.lo `test -f 'enc/frarray.c' || echo '$(srcdir)/'`enc/frarray.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o frarray.lo `test -f 'enc/frarray.c' || echo '$(srcdir)/'`enc/frarray.c - - frinit.lo: enc/frinit.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT frinit.lo -MD -MP -MF "$(DEPDIR)/frinit.Tpo" -c -o frinit.lo `test -f 'enc/frinit.c' || echo '$(srcdir)/'`enc/frinit.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/frinit.Tpo" "$(DEPDIR)/frinit.Plo"; else rm -f "$(DEPDIR)/frinit.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT frinit.lo -MD -MP -MF $(DEPDIR)/frinit.Tpo -c -o frinit.lo `test -f 'enc/frinit.c' || echo '$(srcdir)/'`enc/frinit.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/frinit.Tpo $(DEPDIR)/frinit.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='enc/frinit.c' object='frinit.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o frinit.lo `test -f 'enc/frinit.c' || echo '$(srcdir)/'`enc/frinit.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o frinit.lo `test -f 'enc/frinit.c' || echo '$(srcdir)/'`enc/frinit.c - - mcomp.lo: enc/mcomp.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mcomp.lo -MD -MP -MF "$(DEPDIR)/mcomp.Tpo" -c -o mcomp.lo `test -f 'enc/mcomp.c' || echo '$(srcdir)/'`enc/mcomp.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mcomp.Tpo" "$(DEPDIR)/mcomp.Plo"; else rm -f "$(DEPDIR)/mcomp.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mcomp.lo -MD -MP -MF $(DEPDIR)/mcomp.Tpo -c -o mcomp.lo `test -f 'enc/mcomp.c' || echo '$(srcdir)/'`enc/mcomp.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mcomp.Tpo $(DEPDIR)/mcomp.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='enc/mcomp.c' object='mcomp.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mcomp.lo `test -f 'enc/mcomp.c' || echo '$(srcdir)/'`enc/mcomp.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mcomp.lo `test -f 'enc/mcomp.c' || echo '$(srcdir)/'`enc/mcomp.c - - misc_common.lo: enc/misc_common.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc_common.lo -MD -MP -MF "$(DEPDIR)/misc_common.Tpo" -c -o misc_common.lo `test -f 'enc/misc_common.c' || echo '$(srcdir)/'`enc/misc_common.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/misc_common.Tpo" "$(DEPDIR)/misc_common.Plo"; else rm -f "$(DEPDIR)/misc_common.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc_common.lo -MD -MP -MF $(DEPDIR)/misc_common.Tpo -c -o misc_common.lo `test -f 'enc/misc_common.c' || echo '$(srcdir)/'`enc/misc_common.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/misc_common.Tpo $(DEPDIR)/misc_common.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='enc/misc_common.c' object='misc_common.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc_common.lo `test -f 'enc/misc_common.c' || echo '$(srcdir)/'`enc/misc_common.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc_common.lo `test -f 'enc/misc_common.c' || echo '$(srcdir)/'`enc/misc_common.c - - pb.lo: enc/pb.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pb.lo -MD -MP -MF "$(DEPDIR)/pb.Tpo" -c -o pb.lo `test -f 'enc/pb.c' || echo '$(srcdir)/'`enc/pb.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/pb.Tpo" "$(DEPDIR)/pb.Plo"; else rm -f "$(DEPDIR)/pb.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pb.lo -MD -MP -MF $(DEPDIR)/pb.Tpo -c -o pb.lo `test -f 'enc/pb.c' || echo '$(srcdir)/'`enc/pb.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/pb.Tpo $(DEPDIR)/pb.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='enc/pb.c' object='pb.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pb.lo `test -f 'enc/pb.c' || echo '$(srcdir)/'`enc/pb.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pb.lo `test -f 'enc/pb.c' || echo '$(srcdir)/'`enc/pb.c - - pp.lo: enc/pp.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pp.lo -MD -MP -MF "$(DEPDIR)/pp.Tpo" -c -o pp.lo `test -f 'enc/pp.c' || echo '$(srcdir)/'`enc/pp.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/pp.Tpo" "$(DEPDIR)/pp.Plo"; else rm -f "$(DEPDIR)/pp.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pp.lo -MD -MP -MF $(DEPDIR)/pp.Tpo -c -o pp.lo `test -f 'enc/pp.c' || echo '$(srcdir)/'`enc/pp.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/pp.Tpo $(DEPDIR)/pp.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='enc/pp.c' object='pp.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pp.lo `test -f 'enc/pp.c' || echo '$(srcdir)/'`enc/pp.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pp.lo `test -f 'enc/pp.c' || echo '$(srcdir)/'`enc/pp.c - - reconstruct.lo: enc/reconstruct.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reconstruct.lo -MD -MP -MF "$(DEPDIR)/reconstruct.Tpo" -c -o reconstruct.lo `test -f 'enc/reconstruct.c' || echo '$(srcdir)/'`enc/reconstruct.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/reconstruct.Tpo" "$(DEPDIR)/reconstruct.Plo"; else rm -f "$(DEPDIR)/reconstruct.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reconstruct.lo -MD -MP -MF $(DEPDIR)/reconstruct.Tpo -c -o reconstruct.lo `test -f 'enc/reconstruct.c' || echo '$(srcdir)/'`enc/reconstruct.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/reconstruct.Tpo $(DEPDIR)/reconstruct.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='enc/reconstruct.c' object='reconstruct.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reconstruct.lo `test -f 'enc/reconstruct.c' || echo '$(srcdir)/'`enc/reconstruct.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reconstruct.lo `test -f 'enc/reconstruct.c' || echo '$(srcdir)/'`enc/reconstruct.c - - scan.lo: enc/scan.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT scan.lo -MD -MP -MF "$(DEPDIR)/scan.Tpo" -c -o scan.lo `test -f 'enc/scan.c' || echo '$(srcdir)/'`enc/scan.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/scan.Tpo" "$(DEPDIR)/scan.Plo"; else rm -f "$(DEPDIR)/scan.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT scan.lo -MD -MP -MF $(DEPDIR)/scan.Tpo -c -o scan.lo `test -f 'enc/scan.c' || echo '$(srcdir)/'`enc/scan.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/scan.Tpo $(DEPDIR)/scan.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='enc/scan.c' object='scan.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o scan.lo `test -f 'enc/scan.c' || echo '$(srcdir)/'`enc/scan.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o scan.lo `test -f 'enc/scan.c' || echo '$(srcdir)/'`enc/scan.c - - dsp.lo: enc/dsp.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dsp.lo -MD -MP -MF "$(DEPDIR)/dsp.Tpo" -c -o dsp.lo `test -f 'enc/dsp.c' || echo '$(srcdir)/'`enc/dsp.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/dsp.Tpo" "$(DEPDIR)/dsp.Plo"; else rm -f "$(DEPDIR)/dsp.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dsp.lo -MD -MP -MF $(DEPDIR)/dsp.Tpo -c -o dsp.lo `test -f 'enc/dsp.c' || echo '$(srcdir)/'`enc/dsp.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/dsp.Tpo $(DEPDIR)/dsp.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='enc/dsp.c' object='dsp.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dsp.lo `test -f 'enc/dsp.c' || echo '$(srcdir)/'`enc/dsp.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dsp.lo `test -f 'enc/dsp.c' || echo '$(srcdir)/'`enc/dsp.c - - encoder_disabled.lo: enc/encoder_disabled.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT encoder_disabled.lo -MD -MP -MF "$(DEPDIR)/encoder_disabled.Tpo" -c -o encoder_disabled.lo `test -f 'enc/encoder_disabled.c' || echo '$(srcdir)/'`enc/encoder_disabled.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/encoder_disabled.Tpo" "$(DEPDIR)/encoder_disabled.Plo"; else rm -f "$(DEPDIR)/encoder_disabled.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT encoder_disabled.lo -MD -MP -MF $(DEPDIR)/encoder_disabled.Tpo -c -o encoder_disabled.lo `test -f 'enc/encoder_disabled.c' || echo '$(srcdir)/'`enc/encoder_disabled.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/encoder_disabled.Tpo $(DEPDIR)/encoder_disabled.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='enc/encoder_disabled.c' object='encoder_disabled.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o encoder_disabled.lo `test -f 'enc/encoder_disabled.c' || echo '$(srcdir)/'`enc/encoder_disabled.c -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o encoder_disabled.lo `test -f 'enc/encoder_disabled.c' || echo '$(srcdir)/'`enc/encoder_disabled.c - - mostlyclean-libtool: - -rm -f *.lo -@@ -906,17 +898,13 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --distclean-libtool: -- -rm -f libtool --uninstall-info-am: -- - 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; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -928,8 +916,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -939,13 +927,12 @@ ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - 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; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -959,23 +946,21 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - - distdir: $(DISTFILES) -- $(mkdir_p) $(distdir)/dec $(distdir)/dec/x86 $(distdir)/enc $(distdir)/enc/x86_32 $(distdir)/enc/x86_32_vs $(distdir)/enc/x86_64 -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkdir_p) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -991,7 +976,7 @@ check: check-am - all-am: Makefile $(LTLIBRARIES) $(HEADERS) - installdirs: - for dir in "$(DESTDIR)$(libdir)"; do \ -- test -z "$$dir" || $(mkdir_p) "$$dir"; \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done - install: install-am - install-exec: install-exec-am -@@ -1026,7 +1011,7 @@ distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-tags -+ distclean-tags - - dvi: dvi-am - -@@ -1040,12 +1025,20 @@ info-am: - - install-data-am: - -+install-dvi: install-dvi-am -+ - install-exec-am: install-libLTLIBRARIES - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -1066,20 +1059,23 @@ ps: ps-am - - ps-am: - --uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES -+uninstall-am: uninstall-libLTLIBRARIES -+ -+.MAKE: install-am install-strip - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-exec \ -- install-exec-am install-info install-info-am \ -- install-libLTLIBRARIES install-man install-strip installcheck \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am \ -+ install-libLTLIBRARIES install-man install-pdf install-pdf-am \ -+ install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-info-am \ -- uninstall-libLTLIBRARIES -+ tags uninstall uninstall-am uninstall-libLTLIBRARIES - - - debug: -Index: libtheora-1.0/m4/Makefile.in -=================================================================== ---- libtheora-1.0.orig/m4/Makefile.in -+++ libtheora-1.0/m4/Makefile.in -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.9.6 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 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. -@@ -13,15 +13,11 @@ - # PARTICULAR PURPOSE. - - @SET_MAKE@ --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -40,9 +36,7 @@ subdir = m4 - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ -- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/pkg.m4 \ -- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/vorbis.m4 \ -- $(top_srcdir)/configure.ac -+ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(install_sh) -d -@@ -53,8 +47,6 @@ DIST_SOURCES = - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -64,17 +56,11 @@ AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ - BINDIR = @BINDIR@ - BUILDABLE_EXAMPLES = @BUILDABLE_EXAMPLES@ --BUILD_SPEC_FALSE = @BUILD_SPEC_FALSE@ --BUILD_SPEC_TRUE = @BUILD_SPEC_TRUE@ - CC = @CC@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CPU_x86_32_FALSE = @CPU_x86_32_FALSE@ --CPU_x86_32_TRUE = @CPU_x86_32_TRUE@ --CPU_x86_64_FALSE = @CPU_x86_64_FALSE@ --CPU_x86_64_TRUE = @CPU_x86_64_TRUE@ - CXX = @CXX@ - CXXCPP = @CXXCPP@ - CXXDEPMODE = @CXXDEPMODE@ -@@ -85,6 +71,7 @@ DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DOCDIR = @DOCDIR@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -97,13 +84,11 @@ GETOPT_OBJS = @GETOPT_OBJS@ - GREP = @GREP@ - HAVE_BIBTEX = @HAVE_BIBTEX@ - HAVE_DOXYGEN = @HAVE_DOXYGEN@ --HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ --HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ - HAVE_PDFLATEX = @HAVE_PDFLATEX@ --HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ - HAVE_TRANSFIG = @HAVE_TRANSFIG@ - HAVE_VALGRIND = @HAVE_VALGRIND@ - INCLUDEDIR = @INCLUDEDIR@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -116,13 +101,11 @@ LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OC_X86ASM_FALSE = @OC_X86ASM_FALSE@ --OC_X86ASM_TRUE = @OC_X86ASM_TRUE@ - OGG_CFLAGS = @OGG_CFLAGS@ - OGG_LIBS = @OGG_LIBS@ - PACKAGE = @PACKAGE@ -@@ -137,9 +120,12 @@ PNG_CFLAGS = @PNG_CFLAGS@ - PNG_LIBS = @PNG_LIBS@ - PROFILE = @PROFILE@ - RANLIB = @RANLIB@ -+REQUIRES_OGG = @REQUIRES_OGG@ -+REQUIRES_SDL = @REQUIRES_SDL@ -+REQUIRES_VORBIS = @REQUIRES_VORBIS@ - SDL_CFLAGS = @SDL_CFLAGS@ --SDL_CONFIG = @SDL_CONFIG@ - SDL_LIBS = @SDL_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -151,29 +137,21 @@ THENC_LIB_CURRENT = @THENC_LIB_CURRENT@ - THENC_LIB_REVISION = @THENC_LIB_REVISION@ - THEORADEC_LDFLAGS = @THEORADEC_LDFLAGS@ - THEORAENC_LDFLAGS = @THEORAENC_LDFLAGS@ --THEORA_DISABLE_ENCODE_FALSE = @THEORA_DISABLE_ENCODE_FALSE@ --THEORA_DISABLE_ENCODE_TRUE = @THEORA_DISABLE_ENCODE_TRUE@ --THEORA_DISABLE_FLOAT_FALSE = @THEORA_DISABLE_FLOAT_FALSE@ --THEORA_DISABLE_FLOAT_TRUE = @THEORA_DISABLE_FLOAT_TRUE@ --THEORA_ENABLE_EXAMPLES_FALSE = @THEORA_ENABLE_EXAMPLES_FALSE@ --THEORA_ENABLE_EXAMPLES_TRUE = @THEORA_ENABLE_EXAMPLES_TRUE@ - THEORA_LDFLAGS = @THEORA_LDFLAGS@ - TH_LIB_AGE = @TH_LIB_AGE@ - TH_LIB_CURRENT = @TH_LIB_CURRENT@ - TH_LIB_REVISION = @TH_LIB_REVISION@ - VALGRIND_ENVIRONMENT = @VALGRIND_ENVIRONMENT@ - VERSION = @VERSION@ --VORBISENC_LIBS = @VORBISENC_LIBS@ --VORBISFILE_LIBS = @VORBISFILE_LIBS@ - VORBIS_CFLAGS = @VORBIS_CFLAGS@ - VORBIS_LIBS = @VORBIS_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -@@ -185,6 +163,7 @@ build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -212,12 +191,15 @@ program_transform_name = @program_transf - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target = @target@ - target_alias = @target_alias@ - target_cpu = @target_cpu@ - target_os = @target_os@ - target_vendor = @target_vendor@ -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - EXTRA_DIST = \ - as-ac-expand.m4 \ - ogg.m4 \ -@@ -237,9 +219,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_ - exit 1;; \ - esac; \ - done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign m4/Makefile'; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile'; \ - cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign m4/Makefile -+ $(AUTOMAKE) --gnu m4/Makefile - .PRECIOUS: Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ -@@ -263,10 +245,6 @@ mostlyclean-libtool: - - clean-libtool: - -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --uninstall-info-am: - tags: TAGS - TAGS: - -@@ -275,22 +253,21 @@ CTAGS: - - - distdir: $(DISTFILES) -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkdir_p) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -335,7 +312,7 @@ clean-am: clean-generic clean-libtool mo - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic distclean-libtool -+distclean-am: clean-am distclean-generic - - dvi: dvi-am - -@@ -349,12 +326,20 @@ info-am: - - install-data-am: - -+install-dvi: install-dvi-am -+ - install-exec-am: - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -373,17 +358,20 @@ ps: ps-am - - ps-am: - --uninstall-am: uninstall-info-am -+uninstall-am: -+ -+.MAKE: install-am install-strip - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-exec install-exec-am \ -- install-info install-info-am install-man install-strip \ -+ install-data install-data-am install-dvi install-dvi-am \ -+ install-exec install-exec-am install-html install-html-am \ -+ install-info install-info-am install-man install-pdf \ -+ install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ -- uninstall-info-am -+ mostlyclean-libtool pdf pdf-am ps ps-am 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. -Index: libtheora-1.0/Makefile.in -=================================================================== ---- libtheora-1.0.orig/Makefile.in -+++ libtheora-1.0/Makefile.in -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.9.6 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 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. -@@ -14,15 +14,11 @@ - - @SET_MAKE@ - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = . - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,6 +33,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - target_triplet = @target@ -+subdir = . - DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(srcdir)/libtheora.spec.in $(srcdir)/theora-uninstalled.pc.in \ -@@ -46,16 +43,13 @@ DIST_COMMON = README $(am__configure_dep - $(srcdir)/theoraenc.pc.in $(top_srcdir)/configure AUTHORS \ - COPYING compile config.guess config.sub depcomp install-sh \ - ltmain.sh missing --subdir = . - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ -- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/pkg.m4 \ -- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/vorbis.m4 \ -- $(top_srcdir)/configure.ac -+ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ -- configure.lineno configure.status.lineno -+ configure.lineno config.status.lineno - mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = config.h - CONFIG_CLEAN_FILES = libtheora.spec theora.pc theora-uninstalled.pc \ -@@ -65,10 +59,11 @@ SOURCES = - DIST_SOURCES = - RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ -- install-exec-recursive install-info-recursive \ -- install-recursive installcheck-recursive installdirs-recursive \ -- pdf-recursive ps-recursive uninstall-info-recursive \ -- uninstall-recursive -+ install-dvi-recursive install-exec-recursive \ -+ install-html-recursive install-info-recursive \ -+ install-pdf-recursive install-ps-recursive install-recursive \ -+ installcheck-recursive installdirs-recursive pdf-recursive \ -+ ps-recursive uninstall-recursive - am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; - am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -@@ -78,6 +73,8 @@ am__strip_dir = `echo $$p | sed -e 's|^. - am__installdirs = "$(DESTDIR)$(pkgconfigdir)" - pkgconfigDATA_INSTALL = $(INSTALL_DATA) - DATA = $(pkgconfig_DATA) -+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ -+ distclean-recursive maintainer-clean-recursive - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = lib include doc tests m4 examples -@@ -94,8 +91,6 @@ distuninstallcheck_listfiles = find . -t - distcleancheck_listfiles = find . -type f -print - ACLOCAL = @ACLOCAL@ - ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -105,17 +100,11 @@ AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ - BINDIR = @BINDIR@ - BUILDABLE_EXAMPLES = @BUILDABLE_EXAMPLES@ --BUILD_SPEC_FALSE = @BUILD_SPEC_FALSE@ --BUILD_SPEC_TRUE = @BUILD_SPEC_TRUE@ - CC = @CC@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CPU_x86_32_FALSE = @CPU_x86_32_FALSE@ --CPU_x86_32_TRUE = @CPU_x86_32_TRUE@ --CPU_x86_64_FALSE = @CPU_x86_64_FALSE@ --CPU_x86_64_TRUE = @CPU_x86_64_TRUE@ - CXX = @CXX@ - CXXCPP = @CXXCPP@ - CXXDEPMODE = @CXXDEPMODE@ -@@ -126,6 +115,7 @@ DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DOCDIR = @DOCDIR@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -138,13 +128,11 @@ GETOPT_OBJS = @GETOPT_OBJS@ - GREP = @GREP@ - HAVE_BIBTEX = @HAVE_BIBTEX@ - HAVE_DOXYGEN = @HAVE_DOXYGEN@ --HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ --HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ - HAVE_PDFLATEX = @HAVE_PDFLATEX@ --HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ - HAVE_TRANSFIG = @HAVE_TRANSFIG@ - HAVE_VALGRIND = @HAVE_VALGRIND@ - INCLUDEDIR = @INCLUDEDIR@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -157,13 +145,11 @@ LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OC_X86ASM_FALSE = @OC_X86ASM_FALSE@ --OC_X86ASM_TRUE = @OC_X86ASM_TRUE@ - OGG_CFLAGS = @OGG_CFLAGS@ - OGG_LIBS = @OGG_LIBS@ - PACKAGE = @PACKAGE@ -@@ -178,9 +164,12 @@ PNG_CFLAGS = @PNG_CFLAGS@ - PNG_LIBS = @PNG_LIBS@ - PROFILE = @PROFILE@ - RANLIB = @RANLIB@ -+REQUIRES_OGG = @REQUIRES_OGG@ -+REQUIRES_SDL = @REQUIRES_SDL@ -+REQUIRES_VORBIS = @REQUIRES_VORBIS@ - SDL_CFLAGS = @SDL_CFLAGS@ --SDL_CONFIG = @SDL_CONFIG@ - SDL_LIBS = @SDL_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -192,29 +181,21 @@ THENC_LIB_CURRENT = @THENC_LIB_CURRENT@ - THENC_LIB_REVISION = @THENC_LIB_REVISION@ - THEORADEC_LDFLAGS = @THEORADEC_LDFLAGS@ - THEORAENC_LDFLAGS = @THEORAENC_LDFLAGS@ --THEORA_DISABLE_ENCODE_FALSE = @THEORA_DISABLE_ENCODE_FALSE@ --THEORA_DISABLE_ENCODE_TRUE = @THEORA_DISABLE_ENCODE_TRUE@ --THEORA_DISABLE_FLOAT_FALSE = @THEORA_DISABLE_FLOAT_FALSE@ --THEORA_DISABLE_FLOAT_TRUE = @THEORA_DISABLE_FLOAT_TRUE@ --THEORA_ENABLE_EXAMPLES_FALSE = @THEORA_ENABLE_EXAMPLES_FALSE@ --THEORA_ENABLE_EXAMPLES_TRUE = @THEORA_ENABLE_EXAMPLES_TRUE@ - THEORA_LDFLAGS = @THEORA_LDFLAGS@ - TH_LIB_AGE = @TH_LIB_AGE@ - TH_LIB_CURRENT = @TH_LIB_CURRENT@ - TH_LIB_REVISION = @TH_LIB_REVISION@ - VALGRIND_ENVIRONMENT = @VALGRIND_ENVIRONMENT@ - VERSION = @VERSION@ --VORBISENC_LIBS = @VORBISENC_LIBS@ --VORBISFILE_LIBS = @VORBISFILE_LIBS@ - VORBIS_CFLAGS = @VORBIS_CFLAGS@ - VORBIS_LIBS = @VORBIS_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -@@ -226,6 +207,7 @@ build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -253,12 +235,15 @@ program_transform_name = @program_transf - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target = @target@ - target_alias = @target_alias@ - target_cpu = @target_cpu@ - target_os = @target_os@ - target_vendor = @target_vendor@ -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = foreign 1.6 dist-zip dist-bzip2 - @THEORA_ENABLE_EXAMPLES_FALSE@EXAMPLES_DIR = - @THEORA_ENABLE_EXAMPLES_TRUE@EXAMPLES_DIR = examples -@@ -317,7 +302,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $( - config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ -- $(MAKE) stamp-h1; \ -+ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi - - stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status -@@ -353,10 +338,9 @@ clean-libtool: - - distclean-libtool: - -rm -f libtool --uninstall-info-am: - install-pkgconfigDATA: $(pkgconfig_DATA) - @$(NORMAL_INSTALL) -- test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)" -+ test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" - @list='$(pkgconfig_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ -@@ -403,8 +387,7 @@ $(RECURSIVE_TARGETS): - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --mostlyclean-recursive clean-recursive distclean-recursive \ --maintainer-clean-recursive: -+$(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ -@@ -448,8 +431,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -474,8 +457,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -485,13 +468,12 @@ ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - 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; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -506,24 +488,22 @@ distclean-tags: - - distdir: $(DISTFILES) - $(am__remove_distdir) -- mkdir $(distdir) -- $(mkdir_p) $(distdir)/. $(distdir)/doc $(distdir)/m4 -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ test -d $(distdir) || mkdir $(distdir) -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkdir_p) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -537,7 +517,7 @@ distdir: $(DISTFILES) - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ -- || $(mkdir_p) "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ -@@ -545,6 +525,8 @@ distdir: $(DISTFILES) - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ -+ am__remove_distdir=: \ -+ am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ -@@ -555,7 +537,7 @@ distdir: $(DISTFILES) - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -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 $(SHELL) $(install_sh) -c -m a+r {} {} \; \ -+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) - dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz -@@ -564,6 +546,10 @@ dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -+dist-lzma: distdir -+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma -+ $(am__remove_distdir) -+ - dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) -@@ -592,6 +578,8 @@ distcheck: dist - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ -+ *.tar.lzma*) \ -+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ -@@ -631,7 +619,7 @@ distcheck: dist - $(am__remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ -- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' -+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' - distuninstallcheck: - @cd $(distuninstallcheck_dir) \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ -@@ -656,7 +644,7 @@ all-am: Makefile $(DATA) config.h - installdirs: installdirs-recursive - installdirs-am: - for dir in "$(DESTDIR)$(pkgconfigdir)"; do \ -- test -z "$$dir" || $(mkdir_p) "$$dir"; \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done - install: install-recursive - install-exec: install-exec-recursive -@@ -704,12 +692,20 @@ info-am: - - install-data-am: install-pkgconfigDATA - -+install-dvi: install-dvi-recursive -+ - install-exec-am: - -+install-html: install-html-recursive -+ - install-info: install-info-recursive - - install-man: - -+install-pdf: install-pdf-recursive -+ -+install-ps: install-ps-recursive -+ - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -730,26 +726,27 @@ ps: ps-recursive - - ps-am: - --uninstall-am: uninstall-info-am uninstall-pkgconfigDATA -+uninstall-am: uninstall-pkgconfigDATA - --uninstall-info: uninstall-info-recursive -+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ -+ install-strip - --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ -- check-am clean clean-generic clean-libtool clean-recursive \ -- ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ -- dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \ -- distclean-generic distclean-hdr distclean-libtool \ -- distclean-recursive distclean-tags distcleancheck distdir \ -+.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-hook 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-exec \ -- install-exec-am install-info install-info-am install-man \ -- install-pkgconfigDATA install-strip installcheck \ -- installcheck-am installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic maintainer-clean-recursive \ -- mostlyclean mostlyclean-generic mostlyclean-libtool \ -- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am uninstall-info-am \ -- uninstall-pkgconfigDATA -+ 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 - - - # Remove the .svn folders included in the tarball -Index: libtheora-1.0/tests/Makefile.in -=================================================================== ---- libtheora-1.0.orig/tests/Makefile.in -+++ libtheora-1.0/tests/Makefile.in -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.9.6 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008 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. -@@ -14,15 +14,11 @@ - - @SET_MAKE@ - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,15 +33,15 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - target_triplet = @target@ -+@THEORA_DISABLE_ENCODE_FALSE@TESTS = $(am__EXEEXT_1) $(am__EXEEXT_2) -+@THEORA_DISABLE_ENCODE_TRUE@TESTS = $(am__EXEEXT_1) - check_PROGRAMS = $(am__EXEEXT_3) - subdir = tests - DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ -- $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/pkg.m4 \ -- $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/vorbis.m4 \ -- $(top_srcdir)/configure.ac -+ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(install_sh) -d -@@ -65,46 +61,77 @@ am__DEPENDENCIES_1 = - am__DEPENDENCIES_2 = $(THEORADIR)/libtheoradec.la \ - $(am__DEPENDENCIES_1) - comment_DEPENDENCIES = $(am__DEPENDENCIES_2) -+comment_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(comment_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ - am_comment_theora_OBJECTS = comment_theora-comment_theora.$(OBJEXT) - comment_theora_OBJECTS = $(am_comment_theora_OBJECTS) - am__DEPENDENCIES_3 = $(THEORADIR)/libtheora.la $(am__DEPENDENCIES_1) - comment_theora_DEPENDENCIES = $(am__DEPENDENCIES_3) -+comment_theora_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(comment_theora_CFLAGS) \ -+ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - am_comment_theoradec_OBJECTS = comment_theoradec-comment.$(OBJEXT) - comment_theoradec_OBJECTS = $(am_comment_theoradec_OBJECTS) - comment_theoradec_DEPENDENCIES = $(am__DEPENDENCIES_2) -+comment_theoradec_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -+ $(comment_theoradec_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ -+ -o $@ - am_granulepos_OBJECTS = granulepos-granulepos.$(OBJEXT) - granulepos_OBJECTS = $(am_granulepos_OBJECTS) - am__DEPENDENCIES_4 = $(THEORADIR)/libtheoraenc.la \ - $(THEORADIR)/libtheoradec.la $(am__DEPENDENCIES_1) - granulepos_DEPENDENCIES = $(am__DEPENDENCIES_4) -+granulepos_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(granulepos_CFLAGS) \ -+ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - am_granulepos_theora_OBJECTS = \ - granulepos_theora-granulepos_theora.$(OBJEXT) - granulepos_theora_OBJECTS = $(am_granulepos_theora_OBJECTS) - granulepos_theora_DEPENDENCIES = $(am__DEPENDENCIES_3) -+granulepos_theora_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -+ $(granulepos_theora_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ -+ -o $@ - am_granulepos_theoraenc_OBJECTS = \ - granulepos_theoraenc-granulepos_theora.$(OBJEXT) - granulepos_theoraenc_OBJECTS = $(am_granulepos_theoraenc_OBJECTS) - granulepos_theoraenc_DEPENDENCIES = $(am__DEPENDENCIES_4) -+granulepos_theoraenc_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -+ $(granulepos_theoraenc_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ - am_noop_OBJECTS = noop-noop.$(OBJEXT) - noop_OBJECTS = $(am_noop_OBJECTS) - noop_DEPENDENCIES = $(am__DEPENDENCIES_4) -+noop_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(noop_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ - am_noop_theora_OBJECTS = noop_theora-noop_theora.$(OBJEXT) - noop_theora_OBJECTS = $(am_noop_theora_OBJECTS) - noop_theora_DEPENDENCIES = $(am__DEPENDENCIES_3) -+noop_theora_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(noop_theora_CFLAGS) \ -+ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - am_noop_theoraenc_OBJECTS = noop_theoraenc-noop_theora.$(OBJEXT) - noop_theoraenc_OBJECTS = $(am_noop_theoraenc_OBJECTS) - noop_theoraenc_DEPENDENCIES = $(am__DEPENDENCIES_4) --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+noop_theoraenc_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(noop_theoraenc_CFLAGS) \ -+ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -- $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ - SOURCES = $(comment_SOURCES) $(comment_theora_SOURCES) \ - $(comment_theoradec_SOURCES) $(granulepos_SOURCES) \ - $(granulepos_theora_SOURCES) $(granulepos_theoraenc_SOURCES) \ -@@ -121,8 +148,6 @@ CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -132,17 +157,11 @@ AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ - BINDIR = @BINDIR@ - BUILDABLE_EXAMPLES = @BUILDABLE_EXAMPLES@ --BUILD_SPEC_FALSE = @BUILD_SPEC_FALSE@ --BUILD_SPEC_TRUE = @BUILD_SPEC_TRUE@ - CC = @CC@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CPU_x86_32_FALSE = @CPU_x86_32_FALSE@ --CPU_x86_32_TRUE = @CPU_x86_32_TRUE@ --CPU_x86_64_FALSE = @CPU_x86_64_FALSE@ --CPU_x86_64_TRUE = @CPU_x86_64_TRUE@ - CXX = @CXX@ - CXXCPP = @CXXCPP@ - CXXDEPMODE = @CXXDEPMODE@ -@@ -153,6 +172,7 @@ DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLTOOL = @DLLTOOL@ - DOCDIR = @DOCDIR@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -165,13 +185,11 @@ GETOPT_OBJS = @GETOPT_OBJS@ - GREP = @GREP@ - HAVE_BIBTEX = @HAVE_BIBTEX@ - HAVE_DOXYGEN = @HAVE_DOXYGEN@ --HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ --HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@ - HAVE_PDFLATEX = @HAVE_PDFLATEX@ --HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ - HAVE_TRANSFIG = @HAVE_TRANSFIG@ - HAVE_VALGRIND = @HAVE_VALGRIND@ - INCLUDEDIR = @INCLUDEDIR@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -184,13 +202,11 @@ LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ -+NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OC_X86ASM_FALSE = @OC_X86ASM_FALSE@ --OC_X86ASM_TRUE = @OC_X86ASM_TRUE@ - OGG_CFLAGS = @OGG_CFLAGS@ - OGG_LIBS = @OGG_LIBS@ - PACKAGE = @PACKAGE@ -@@ -205,9 +221,12 @@ PNG_CFLAGS = @PNG_CFLAGS@ - PNG_LIBS = @PNG_LIBS@ - PROFILE = @PROFILE@ - RANLIB = @RANLIB@ -+REQUIRES_OGG = @REQUIRES_OGG@ -+REQUIRES_SDL = @REQUIRES_SDL@ -+REQUIRES_VORBIS = @REQUIRES_VORBIS@ - SDL_CFLAGS = @SDL_CFLAGS@ --SDL_CONFIG = @SDL_CONFIG@ - SDL_LIBS = @SDL_LIBS@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -219,29 +238,21 @@ THENC_LIB_CURRENT = @THENC_LIB_CURRENT@ - THENC_LIB_REVISION = @THENC_LIB_REVISION@ - THEORADEC_LDFLAGS = @THEORADEC_LDFLAGS@ - THEORAENC_LDFLAGS = @THEORAENC_LDFLAGS@ --THEORA_DISABLE_ENCODE_FALSE = @THEORA_DISABLE_ENCODE_FALSE@ --THEORA_DISABLE_ENCODE_TRUE = @THEORA_DISABLE_ENCODE_TRUE@ --THEORA_DISABLE_FLOAT_FALSE = @THEORA_DISABLE_FLOAT_FALSE@ --THEORA_DISABLE_FLOAT_TRUE = @THEORA_DISABLE_FLOAT_TRUE@ --THEORA_ENABLE_EXAMPLES_FALSE = @THEORA_ENABLE_EXAMPLES_FALSE@ --THEORA_ENABLE_EXAMPLES_TRUE = @THEORA_ENABLE_EXAMPLES_TRUE@ - THEORA_LDFLAGS = @THEORA_LDFLAGS@ - TH_LIB_AGE = @TH_LIB_AGE@ - TH_LIB_CURRENT = @TH_LIB_CURRENT@ - TH_LIB_REVISION = @TH_LIB_REVISION@ - VALGRIND_ENVIRONMENT = @VALGRIND_ENVIRONMENT@ - VERSION = @VERSION@ --VORBISENC_LIBS = @VORBISENC_LIBS@ --VORBISFILE_LIBS = @VORBISFILE_LIBS@ - VORBIS_CFLAGS = @VORBIS_CFLAGS@ - VORBIS_LIBS = @VORBIS_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -@@ -253,6 +264,7 @@ build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -280,12 +292,15 @@ program_transform_name = @program_transf - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target = @target@ - target_alias = @target_alias@ - target_cpu = @target_cpu@ - target_os = @target_os@ - target_vendor = @target_vendor@ -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - INCLUDES = -I$(top_srcdir)/include - noinst_HEADERS = tests.h - AM_CFLAGS = $(OGG_CFLAGS) -@@ -302,8 +317,6 @@ TESTS_DEC = noop_theora \ - TESTS_ENC = noop noop_theoraenc \ - granulepos granulepos_theoraenc granulepos_theora - --@THEORA_DISABLE_ENCODE_FALSE@TESTS = $(TESTS_DEC) $(TESTS_ENC) --@THEORA_DISABLE_ENCODE_TRUE@TESTS = $(TESTS_DEC) - # dummy call tests for the current api - noop_SOURCES = noop.c - noop_LDADD = $(THEORAENC_LIBS) -@@ -355,9 +368,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_ - exit 1;; \ - esac; \ - done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \ - cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign tests/Makefile -+ $(AUTOMAKE) --gnu tests/Makefile - .PRECIOUS: Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ -@@ -384,31 +397,31 @@ clean-checkPROGRAMS: - done - comment$(EXEEXT): $(comment_OBJECTS) $(comment_DEPENDENCIES) - @rm -f comment$(EXEEXT) -- $(LINK) $(comment_LDFLAGS) $(comment_OBJECTS) $(comment_LDADD) $(LIBS) -+ $(comment_LINK) $(comment_OBJECTS) $(comment_LDADD) $(LIBS) - comment_theora$(EXEEXT): $(comment_theora_OBJECTS) $(comment_theora_DEPENDENCIES) - @rm -f comment_theora$(EXEEXT) -- $(LINK) $(comment_theora_LDFLAGS) $(comment_theora_OBJECTS) $(comment_theora_LDADD) $(LIBS) -+ $(comment_theora_LINK) $(comment_theora_OBJECTS) $(comment_theora_LDADD) $(LIBS) - comment_theoradec$(EXEEXT): $(comment_theoradec_OBJECTS) $(comment_theoradec_DEPENDENCIES) - @rm -f comment_theoradec$(EXEEXT) -- $(LINK) $(comment_theoradec_LDFLAGS) $(comment_theoradec_OBJECTS) $(comment_theoradec_LDADD) $(LIBS) -+ $(comment_theoradec_LINK) $(comment_theoradec_OBJECTS) $(comment_theoradec_LDADD) $(LIBS) - granulepos$(EXEEXT): $(granulepos_OBJECTS) $(granulepos_DEPENDENCIES) - @rm -f granulepos$(EXEEXT) -- $(LINK) $(granulepos_LDFLAGS) $(granulepos_OBJECTS) $(granulepos_LDADD) $(LIBS) -+ $(granulepos_LINK) $(granulepos_OBJECTS) $(granulepos_LDADD) $(LIBS) - granulepos_theora$(EXEEXT): $(granulepos_theora_OBJECTS) $(granulepos_theora_DEPENDENCIES) - @rm -f granulepos_theora$(EXEEXT) -- $(LINK) $(granulepos_theora_LDFLAGS) $(granulepos_theora_OBJECTS) $(granulepos_theora_LDADD) $(LIBS) -+ $(granulepos_theora_LINK) $(granulepos_theora_OBJECTS) $(granulepos_theora_LDADD) $(LIBS) - granulepos_theoraenc$(EXEEXT): $(granulepos_theoraenc_OBJECTS) $(granulepos_theoraenc_DEPENDENCIES) - @rm -f granulepos_theoraenc$(EXEEXT) -- $(LINK) $(granulepos_theoraenc_LDFLAGS) $(granulepos_theoraenc_OBJECTS) $(granulepos_theoraenc_LDADD) $(LIBS) -+ $(granulepos_theoraenc_LINK) $(granulepos_theoraenc_OBJECTS) $(granulepos_theoraenc_LDADD) $(LIBS) - noop$(EXEEXT): $(noop_OBJECTS) $(noop_DEPENDENCIES) - @rm -f noop$(EXEEXT) -- $(LINK) $(noop_LDFLAGS) $(noop_OBJECTS) $(noop_LDADD) $(LIBS) -+ $(noop_LINK) $(noop_OBJECTS) $(noop_LDADD) $(LIBS) - noop_theora$(EXEEXT): $(noop_theora_OBJECTS) $(noop_theora_DEPENDENCIES) - @rm -f noop_theora$(EXEEXT) -- $(LINK) $(noop_theora_LDFLAGS) $(noop_theora_OBJECTS) $(noop_theora_LDADD) $(LIBS) -+ $(noop_theora_LINK) $(noop_theora_OBJECTS) $(noop_theora_LDADD) $(LIBS) - noop_theoraenc$(EXEEXT): $(noop_theoraenc_OBJECTS) $(noop_theoraenc_DEPENDENCIES) - @rm -f noop_theoraenc$(EXEEXT) -- $(LINK) $(noop_theoraenc_LDFLAGS) $(noop_theoraenc_OBJECTS) $(noop_theoraenc_LDADD) $(LIBS) -+ $(noop_theoraenc_LINK) $(noop_theoraenc_OBJECTS) $(noop_theoraenc_LDADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -427,148 +440,148 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/noop_theoraenc-noop_theora.Po@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(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@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ mv -f $(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@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(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 $@ $< - - comment-comment.o: comment.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(comment_CFLAGS) $(CFLAGS) -MT comment-comment.o -MD -MP -MF "$(DEPDIR)/comment-comment.Tpo" -c -o comment-comment.o `test -f 'comment.c' || echo '$(srcdir)/'`comment.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/comment-comment.Tpo" "$(DEPDIR)/comment-comment.Po"; else rm -f "$(DEPDIR)/comment-comment.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(comment_CFLAGS) $(CFLAGS) -MT comment-comment.o -MD -MP -MF $(DEPDIR)/comment-comment.Tpo -c -o comment-comment.o `test -f 'comment.c' || echo '$(srcdir)/'`comment.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/comment-comment.Tpo $(DEPDIR)/comment-comment.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='comment.c' object='comment-comment.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) $(comment_CFLAGS) $(CFLAGS) -c -o comment-comment.o `test -f 'comment.c' || echo '$(srcdir)/'`comment.c - - comment-comment.obj: comment.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(comment_CFLAGS) $(CFLAGS) -MT comment-comment.obj -MD -MP -MF "$(DEPDIR)/comment-comment.Tpo" -c -o comment-comment.obj `if test -f 'comment.c'; then $(CYGPATH_W) 'comment.c'; else $(CYGPATH_W) '$(srcdir)/comment.c'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/comment-comment.Tpo" "$(DEPDIR)/comment-comment.Po"; else rm -f "$(DEPDIR)/comment-comment.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(comment_CFLAGS) $(CFLAGS) -MT comment-comment.obj -MD -MP -MF $(DEPDIR)/comment-comment.Tpo -c -o comment-comment.obj `if test -f 'comment.c'; then $(CYGPATH_W) 'comment.c'; else $(CYGPATH_W) '$(srcdir)/comment.c'; fi` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/comment-comment.Tpo $(DEPDIR)/comment-comment.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='comment.c' object='comment-comment.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) $(comment_CFLAGS) $(CFLAGS) -c -o comment-comment.obj `if test -f 'comment.c'; then $(CYGPATH_W) 'comment.c'; else $(CYGPATH_W) '$(srcdir)/comment.c'; fi` - - comment_theora-comment_theora.o: comment_theora.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(comment_theora_CFLAGS) $(CFLAGS) -MT comment_theora-comment_theora.o -MD -MP -MF "$(DEPDIR)/comment_theora-comment_theora.Tpo" -c -o comment_theora-comment_theora.o `test -f 'comment_theora.c' || echo '$(srcdir)/'`comment_theora.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/comment_theora-comment_theora.Tpo" "$(DEPDIR)/comment_theora-comment_theora.Po"; else rm -f "$(DEPDIR)/comment_theora-comment_theora.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(comment_theora_CFLAGS) $(CFLAGS) -MT comment_theora-comment_theora.o -MD -MP -MF $(DEPDIR)/comment_theora-comment_theora.Tpo -c -o comment_theora-comment_theora.o `test -f 'comment_theora.c' || echo '$(srcdir)/'`comment_theora.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/comment_theora-comment_theora.Tpo $(DEPDIR)/comment_theora-comment_theora.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='comment_theora.c' object='comment_theora-comment_theora.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) $(comment_theora_CFLAGS) $(CFLAGS) -c -o comment_theora-comment_theora.o `test -f 'comment_theora.c' || echo '$(srcdir)/'`comment_theora.c - - comment_theora-comment_theora.obj: comment_theora.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(comment_theora_CFLAGS) $(CFLAGS) -MT comment_theora-comment_theora.obj -MD -MP -MF "$(DEPDIR)/comment_theora-comment_theora.Tpo" -c -o comment_theora-comment_theora.obj `if test -f 'comment_theora.c'; then $(CYGPATH_W) 'comment_theora.c'; else $(CYGPATH_W) '$(srcdir)/comment_theora.c'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/comment_theora-comment_theora.Tpo" "$(DEPDIR)/comment_theora-comment_theora.Po"; else rm -f "$(DEPDIR)/comment_theora-comment_theora.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(comment_theora_CFLAGS) $(CFLAGS) -MT comment_theora-comment_theora.obj -MD -MP -MF $(DEPDIR)/comment_theora-comment_theora.Tpo -c -o comment_theora-comment_theora.obj `if test -f 'comment_theora.c'; then $(CYGPATH_W) 'comment_theora.c'; else $(CYGPATH_W) '$(srcdir)/comment_theora.c'; fi` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/comment_theora-comment_theora.Tpo $(DEPDIR)/comment_theora-comment_theora.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='comment_theora.c' object='comment_theora-comment_theora.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) $(comment_theora_CFLAGS) $(CFLAGS) -c -o comment_theora-comment_theora.obj `if test -f 'comment_theora.c'; then $(CYGPATH_W) 'comment_theora.c'; else $(CYGPATH_W) '$(srcdir)/comment_theora.c'; fi` - - comment_theoradec-comment.o: comment.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(comment_theoradec_CFLAGS) $(CFLAGS) -MT comment_theoradec-comment.o -MD -MP -MF "$(DEPDIR)/comment_theoradec-comment.Tpo" -c -o comment_theoradec-comment.o `test -f 'comment.c' || echo '$(srcdir)/'`comment.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/comment_theoradec-comment.Tpo" "$(DEPDIR)/comment_theoradec-comment.Po"; else rm -f "$(DEPDIR)/comment_theoradec-comment.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(comment_theoradec_CFLAGS) $(CFLAGS) -MT comment_theoradec-comment.o -MD -MP -MF $(DEPDIR)/comment_theoradec-comment.Tpo -c -o comment_theoradec-comment.o `test -f 'comment.c' || echo '$(srcdir)/'`comment.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/comment_theoradec-comment.Tpo $(DEPDIR)/comment_theoradec-comment.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='comment.c' object='comment_theoradec-comment.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) $(comment_theoradec_CFLAGS) $(CFLAGS) -c -o comment_theoradec-comment.o `test -f 'comment.c' || echo '$(srcdir)/'`comment.c - - comment_theoradec-comment.obj: comment.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(comment_theoradec_CFLAGS) $(CFLAGS) -MT comment_theoradec-comment.obj -MD -MP -MF "$(DEPDIR)/comment_theoradec-comment.Tpo" -c -o comment_theoradec-comment.obj `if test -f 'comment.c'; then $(CYGPATH_W) 'comment.c'; else $(CYGPATH_W) '$(srcdir)/comment.c'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/comment_theoradec-comment.Tpo" "$(DEPDIR)/comment_theoradec-comment.Po"; else rm -f "$(DEPDIR)/comment_theoradec-comment.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(comment_theoradec_CFLAGS) $(CFLAGS) -MT comment_theoradec-comment.obj -MD -MP -MF $(DEPDIR)/comment_theoradec-comment.Tpo -c -o comment_theoradec-comment.obj `if test -f 'comment.c'; then $(CYGPATH_W) 'comment.c'; else $(CYGPATH_W) '$(srcdir)/comment.c'; fi` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/comment_theoradec-comment.Tpo $(DEPDIR)/comment_theoradec-comment.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='comment.c' object='comment_theoradec-comment.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) $(comment_theoradec_CFLAGS) $(CFLAGS) -c -o comment_theoradec-comment.obj `if test -f 'comment.c'; then $(CYGPATH_W) 'comment.c'; else $(CYGPATH_W) '$(srcdir)/comment.c'; fi` - - granulepos-granulepos.o: granulepos.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(granulepos_CFLAGS) $(CFLAGS) -MT granulepos-granulepos.o -MD -MP -MF "$(DEPDIR)/granulepos-granulepos.Tpo" -c -o granulepos-granulepos.o `test -f 'granulepos.c' || echo '$(srcdir)/'`granulepos.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/granulepos-granulepos.Tpo" "$(DEPDIR)/granulepos-granulepos.Po"; else rm -f "$(DEPDIR)/granulepos-granulepos.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(granulepos_CFLAGS) $(CFLAGS) -MT granulepos-granulepos.o -MD -MP -MF $(DEPDIR)/granulepos-granulepos.Tpo -c -o granulepos-granulepos.o `test -f 'granulepos.c' || echo '$(srcdir)/'`granulepos.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/granulepos-granulepos.Tpo $(DEPDIR)/granulepos-granulepos.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='granulepos.c' object='granulepos-granulepos.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) $(granulepos_CFLAGS) $(CFLAGS) -c -o granulepos-granulepos.o `test -f 'granulepos.c' || echo '$(srcdir)/'`granulepos.c - - granulepos-granulepos.obj: granulepos.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(granulepos_CFLAGS) $(CFLAGS) -MT granulepos-granulepos.obj -MD -MP -MF "$(DEPDIR)/granulepos-granulepos.Tpo" -c -o granulepos-granulepos.obj `if test -f 'granulepos.c'; then $(CYGPATH_W) 'granulepos.c'; else $(CYGPATH_W) '$(srcdir)/granulepos.c'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/granulepos-granulepos.Tpo" "$(DEPDIR)/granulepos-granulepos.Po"; else rm -f "$(DEPDIR)/granulepos-granulepos.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(granulepos_CFLAGS) $(CFLAGS) -MT granulepos-granulepos.obj -MD -MP -MF $(DEPDIR)/granulepos-granulepos.Tpo -c -o granulepos-granulepos.obj `if test -f 'granulepos.c'; then $(CYGPATH_W) 'granulepos.c'; else $(CYGPATH_W) '$(srcdir)/granulepos.c'; fi` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/granulepos-granulepos.Tpo $(DEPDIR)/granulepos-granulepos.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='granulepos.c' object='granulepos-granulepos.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) $(granulepos_CFLAGS) $(CFLAGS) -c -o granulepos-granulepos.obj `if test -f 'granulepos.c'; then $(CYGPATH_W) 'granulepos.c'; else $(CYGPATH_W) '$(srcdir)/granulepos.c'; fi` - - granulepos_theora-granulepos_theora.o: granulepos_theora.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(granulepos_theora_CFLAGS) $(CFLAGS) -MT granulepos_theora-granulepos_theora.o -MD -MP -MF "$(DEPDIR)/granulepos_theora-granulepos_theora.Tpo" -c -o granulepos_theora-granulepos_theora.o `test -f 'granulepos_theora.c' || echo '$(srcdir)/'`granulepos_theora.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/granulepos_theora-granulepos_theora.Tpo" "$(DEPDIR)/granulepos_theora-granulepos_theora.Po"; else rm -f "$(DEPDIR)/granulepos_theora-granulepos_theora.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(granulepos_theora_CFLAGS) $(CFLAGS) -MT granulepos_theora-granulepos_theora.o -MD -MP -MF $(DEPDIR)/granulepos_theora-granulepos_theora.Tpo -c -o granulepos_theora-granulepos_theora.o `test -f 'granulepos_theora.c' || echo '$(srcdir)/'`granulepos_theora.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/granulepos_theora-granulepos_theora.Tpo $(DEPDIR)/granulepos_theora-granulepos_theora.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='granulepos_theora.c' object='granulepos_theora-granulepos_theora.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) $(granulepos_theora_CFLAGS) $(CFLAGS) -c -o granulepos_theora-granulepos_theora.o `test -f 'granulepos_theora.c' || echo '$(srcdir)/'`granulepos_theora.c - - granulepos_theora-granulepos_theora.obj: granulepos_theora.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(granulepos_theora_CFLAGS) $(CFLAGS) -MT granulepos_theora-granulepos_theora.obj -MD -MP -MF "$(DEPDIR)/granulepos_theora-granulepos_theora.Tpo" -c -o granulepos_theora-granulepos_theora.obj `if test -f 'granulepos_theora.c'; then $(CYGPATH_W) 'granulepos_theora.c'; else $(CYGPATH_W) '$(srcdir)/granulepos_theora.c'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/granulepos_theora-granulepos_theora.Tpo" "$(DEPDIR)/granulepos_theora-granulepos_theora.Po"; else rm -f "$(DEPDIR)/granulepos_theora-granulepos_theora.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(granulepos_theora_CFLAGS) $(CFLAGS) -MT granulepos_theora-granulepos_theora.obj -MD -MP -MF $(DEPDIR)/granulepos_theora-granulepos_theora.Tpo -c -o granulepos_theora-granulepos_theora.obj `if test -f 'granulepos_theora.c'; then $(CYGPATH_W) 'granulepos_theora.c'; else $(CYGPATH_W) '$(srcdir)/granulepos_theora.c'; fi` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/granulepos_theora-granulepos_theora.Tpo $(DEPDIR)/granulepos_theora-granulepos_theora.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='granulepos_theora.c' object='granulepos_theora-granulepos_theora.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) $(granulepos_theora_CFLAGS) $(CFLAGS) -c -o granulepos_theora-granulepos_theora.obj `if test -f 'granulepos_theora.c'; then $(CYGPATH_W) 'granulepos_theora.c'; else $(CYGPATH_W) '$(srcdir)/granulepos_theora.c'; fi` - - granulepos_theoraenc-granulepos_theora.o: granulepos_theora.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(granulepos_theoraenc_CFLAGS) $(CFLAGS) -MT granulepos_theoraenc-granulepos_theora.o -MD -MP -MF "$(DEPDIR)/granulepos_theoraenc-granulepos_theora.Tpo" -c -o granulepos_theoraenc-granulepos_theora.o `test -f 'granulepos_theora.c' || echo '$(srcdir)/'`granulepos_theora.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/granulepos_theoraenc-granulepos_theora.Tpo" "$(DEPDIR)/granulepos_theoraenc-granulepos_theora.Po"; else rm -f "$(DEPDIR)/granulepos_theoraenc-granulepos_theora.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(granulepos_theoraenc_CFLAGS) $(CFLAGS) -MT granulepos_theoraenc-granulepos_theora.o -MD -MP -MF $(DEPDIR)/granulepos_theoraenc-granulepos_theora.Tpo -c -o granulepos_theoraenc-granulepos_theora.o `test -f 'granulepos_theora.c' || echo '$(srcdir)/'`granulepos_theora.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/granulepos_theoraenc-granulepos_theora.Tpo $(DEPDIR)/granulepos_theoraenc-granulepos_theora.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='granulepos_theora.c' object='granulepos_theoraenc-granulepos_theora.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) $(granulepos_theoraenc_CFLAGS) $(CFLAGS) -c -o granulepos_theoraenc-granulepos_theora.o `test -f 'granulepos_theora.c' || echo '$(srcdir)/'`granulepos_theora.c - - granulepos_theoraenc-granulepos_theora.obj: granulepos_theora.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(granulepos_theoraenc_CFLAGS) $(CFLAGS) -MT granulepos_theoraenc-granulepos_theora.obj -MD -MP -MF "$(DEPDIR)/granulepos_theoraenc-granulepos_theora.Tpo" -c -o granulepos_theoraenc-granulepos_theora.obj `if test -f 'granulepos_theora.c'; then $(CYGPATH_W) 'granulepos_theora.c'; else $(CYGPATH_W) '$(srcdir)/granulepos_theora.c'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/granulepos_theoraenc-granulepos_theora.Tpo" "$(DEPDIR)/granulepos_theoraenc-granulepos_theora.Po"; else rm -f "$(DEPDIR)/granulepos_theoraenc-granulepos_theora.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(granulepos_theoraenc_CFLAGS) $(CFLAGS) -MT granulepos_theoraenc-granulepos_theora.obj -MD -MP -MF $(DEPDIR)/granulepos_theoraenc-granulepos_theora.Tpo -c -o granulepos_theoraenc-granulepos_theora.obj `if test -f 'granulepos_theora.c'; then $(CYGPATH_W) 'granulepos_theora.c'; else $(CYGPATH_W) '$(srcdir)/granulepos_theora.c'; fi` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/granulepos_theoraenc-granulepos_theora.Tpo $(DEPDIR)/granulepos_theoraenc-granulepos_theora.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='granulepos_theora.c' object='granulepos_theoraenc-granulepos_theora.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) $(granulepos_theoraenc_CFLAGS) $(CFLAGS) -c -o granulepos_theoraenc-granulepos_theora.obj `if test -f 'granulepos_theora.c'; then $(CYGPATH_W) 'granulepos_theora.c'; else $(CYGPATH_W) '$(srcdir)/granulepos_theora.c'; fi` - - noop-noop.o: noop.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(noop_CFLAGS) $(CFLAGS) -MT noop-noop.o -MD -MP -MF "$(DEPDIR)/noop-noop.Tpo" -c -o noop-noop.o `test -f 'noop.c' || echo '$(srcdir)/'`noop.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/noop-noop.Tpo" "$(DEPDIR)/noop-noop.Po"; else rm -f "$(DEPDIR)/noop-noop.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(noop_CFLAGS) $(CFLAGS) -MT noop-noop.o -MD -MP -MF $(DEPDIR)/noop-noop.Tpo -c -o noop-noop.o `test -f 'noop.c' || echo '$(srcdir)/'`noop.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/noop-noop.Tpo $(DEPDIR)/noop-noop.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='noop.c' object='noop-noop.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) $(noop_CFLAGS) $(CFLAGS) -c -o noop-noop.o `test -f 'noop.c' || echo '$(srcdir)/'`noop.c - - noop-noop.obj: noop.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(noop_CFLAGS) $(CFLAGS) -MT noop-noop.obj -MD -MP -MF "$(DEPDIR)/noop-noop.Tpo" -c -o noop-noop.obj `if test -f 'noop.c'; then $(CYGPATH_W) 'noop.c'; else $(CYGPATH_W) '$(srcdir)/noop.c'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/noop-noop.Tpo" "$(DEPDIR)/noop-noop.Po"; else rm -f "$(DEPDIR)/noop-noop.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(noop_CFLAGS) $(CFLAGS) -MT noop-noop.obj -MD -MP -MF $(DEPDIR)/noop-noop.Tpo -c -o noop-noop.obj `if test -f 'noop.c'; then $(CYGPATH_W) 'noop.c'; else $(CYGPATH_W) '$(srcdir)/noop.c'; fi` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/noop-noop.Tpo $(DEPDIR)/noop-noop.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='noop.c' object='noop-noop.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) $(noop_CFLAGS) $(CFLAGS) -c -o noop-noop.obj `if test -f 'noop.c'; then $(CYGPATH_W) 'noop.c'; else $(CYGPATH_W) '$(srcdir)/noop.c'; fi` - - noop_theora-noop_theora.o: noop_theora.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(noop_theora_CFLAGS) $(CFLAGS) -MT noop_theora-noop_theora.o -MD -MP -MF "$(DEPDIR)/noop_theora-noop_theora.Tpo" -c -o noop_theora-noop_theora.o `test -f 'noop_theora.c' || echo '$(srcdir)/'`noop_theora.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/noop_theora-noop_theora.Tpo" "$(DEPDIR)/noop_theora-noop_theora.Po"; else rm -f "$(DEPDIR)/noop_theora-noop_theora.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(noop_theora_CFLAGS) $(CFLAGS) -MT noop_theora-noop_theora.o -MD -MP -MF $(DEPDIR)/noop_theora-noop_theora.Tpo -c -o noop_theora-noop_theora.o `test -f 'noop_theora.c' || echo '$(srcdir)/'`noop_theora.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/noop_theora-noop_theora.Tpo $(DEPDIR)/noop_theora-noop_theora.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='noop_theora.c' object='noop_theora-noop_theora.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) $(noop_theora_CFLAGS) $(CFLAGS) -c -o noop_theora-noop_theora.o `test -f 'noop_theora.c' || echo '$(srcdir)/'`noop_theora.c - - noop_theora-noop_theora.obj: noop_theora.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(noop_theora_CFLAGS) $(CFLAGS) -MT noop_theora-noop_theora.obj -MD -MP -MF "$(DEPDIR)/noop_theora-noop_theora.Tpo" -c -o noop_theora-noop_theora.obj `if test -f 'noop_theora.c'; then $(CYGPATH_W) 'noop_theora.c'; else $(CYGPATH_W) '$(srcdir)/noop_theora.c'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/noop_theora-noop_theora.Tpo" "$(DEPDIR)/noop_theora-noop_theora.Po"; else rm -f "$(DEPDIR)/noop_theora-noop_theora.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(noop_theora_CFLAGS) $(CFLAGS) -MT noop_theora-noop_theora.obj -MD -MP -MF $(DEPDIR)/noop_theora-noop_theora.Tpo -c -o noop_theora-noop_theora.obj `if test -f 'noop_theora.c'; then $(CYGPATH_W) 'noop_theora.c'; else $(CYGPATH_W) '$(srcdir)/noop_theora.c'; fi` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/noop_theora-noop_theora.Tpo $(DEPDIR)/noop_theora-noop_theora.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='noop_theora.c' object='noop_theora-noop_theora.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) $(noop_theora_CFLAGS) $(CFLAGS) -c -o noop_theora-noop_theora.obj `if test -f 'noop_theora.c'; then $(CYGPATH_W) 'noop_theora.c'; else $(CYGPATH_W) '$(srcdir)/noop_theora.c'; fi` - - noop_theoraenc-noop_theora.o: noop_theora.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(noop_theoraenc_CFLAGS) $(CFLAGS) -MT noop_theoraenc-noop_theora.o -MD -MP -MF "$(DEPDIR)/noop_theoraenc-noop_theora.Tpo" -c -o noop_theoraenc-noop_theora.o `test -f 'noop_theora.c' || echo '$(srcdir)/'`noop_theora.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/noop_theoraenc-noop_theora.Tpo" "$(DEPDIR)/noop_theoraenc-noop_theora.Po"; else rm -f "$(DEPDIR)/noop_theoraenc-noop_theora.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(noop_theoraenc_CFLAGS) $(CFLAGS) -MT noop_theoraenc-noop_theora.o -MD -MP -MF $(DEPDIR)/noop_theoraenc-noop_theora.Tpo -c -o noop_theoraenc-noop_theora.o `test -f 'noop_theora.c' || echo '$(srcdir)/'`noop_theora.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/noop_theoraenc-noop_theora.Tpo $(DEPDIR)/noop_theoraenc-noop_theora.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='noop_theora.c' object='noop_theoraenc-noop_theora.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) $(noop_theoraenc_CFLAGS) $(CFLAGS) -c -o noop_theoraenc-noop_theora.o `test -f 'noop_theora.c' || echo '$(srcdir)/'`noop_theora.c - - noop_theoraenc-noop_theora.obj: noop_theora.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(noop_theoraenc_CFLAGS) $(CFLAGS) -MT noop_theoraenc-noop_theora.obj -MD -MP -MF "$(DEPDIR)/noop_theoraenc-noop_theora.Tpo" -c -o noop_theoraenc-noop_theora.obj `if test -f 'noop_theora.c'; then $(CYGPATH_W) 'noop_theora.c'; else $(CYGPATH_W) '$(srcdir)/noop_theora.c'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/noop_theoraenc-noop_theora.Tpo" "$(DEPDIR)/noop_theoraenc-noop_theora.Po"; else rm -f "$(DEPDIR)/noop_theoraenc-noop_theora.Tpo"; exit 1; fi -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(noop_theoraenc_CFLAGS) $(CFLAGS) -MT noop_theoraenc-noop_theora.obj -MD -MP -MF $(DEPDIR)/noop_theoraenc-noop_theora.Tpo -c -o noop_theoraenc-noop_theora.obj `if test -f 'noop_theora.c'; then $(CYGPATH_W) 'noop_theora.c'; else $(CYGPATH_W) '$(srcdir)/noop_theora.c'; fi` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/noop_theoraenc-noop_theora.Tpo $(DEPDIR)/noop_theoraenc-noop_theora.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='noop_theora.c' object='noop_theoraenc-noop_theora.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) $(noop_theoraenc_CFLAGS) $(CFLAGS) -c -o noop_theoraenc-noop_theora.obj `if test -f 'noop_theora.c'; then $(CYGPATH_W) 'noop_theora.c'; else $(CYGPATH_W) '$(srcdir)/noop_theora.c'; fi` -@@ -579,17 +592,13 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --distclean-libtool: -- -rm -f libtool --uninstall-info-am: -- - 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; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -601,8 +610,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -612,13 +621,12 @@ ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - 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; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -632,9 +640,9 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - - check-TESTS: $(TESTS) -- @failed=0; all=0; xfail=0; xpass=0; skip=0; \ -+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ - srcdir=$(srcdir); export srcdir; \ -- list='$(TESTS)'; \ -+ list=' $(TESTS) '; \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ -@@ -643,7 +651,7 @@ check-TESTS: $(TESTS) - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ -- *" $$tst "*) \ -+ *$$ws$$tst$$ws*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - echo "XPASS: $$tst"; \ -@@ -655,7 +663,7 @@ check-TESTS: $(TESTS) - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ -- *" $$tst "*) \ -+ *$$ws$$tst$$ws*) \ - xfail=`expr $$xfail + 1`; \ - echo "XFAIL: $$tst"; \ - ;; \ -@@ -705,22 +713,21 @@ check-TESTS: $(TESTS) - else :; fi - - distdir: $(DISTFILES) -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkdir_p) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -770,7 +777,7 @@ distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-tags -+ distclean-tags - - dvi: dvi-am - -@@ -784,12 +791,20 @@ info-am: - - install-data-am: - -+install-dvi: install-dvi-am -+ - install-exec-am: - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -810,19 +825,23 @@ ps: ps-am - - ps-am: - --uninstall-am: uninstall-info-am -+uninstall-am: -+ -+.MAKE: install-am install-strip - - .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool ctags \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ -- install-data-am install-exec install-exec-am install-info \ -- install-info-am install-man install-strip installcheck \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-info-am -+ tags uninstall uninstall-am - - test: check - # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/patches/libtheora-1.0/series b/patches/libtheora-1.0/series index 063ada7eb..10f7ff3fc 100644 --- a/patches/libtheora-1.0/series +++ b/patches/libtheora-1.0/series @@ -1,5 +1,4 @@ libtheora-1.0beta3-configure-vorbis.diff libtheora-1.0beta3-configure-sdl.diff libtheora-1.0beta3-configure-ogg.diff -libtheora-1.0beta3-autogen.diff |