--- liboil-0.3.13.orig/debian/liboil0.3-dev.install +++ liboil-0.3.13/debian/liboil0.3-dev.install @@ -0,0 +1,5 @@ +debian/tmp/usr/lib/liboil-0.3.so +debian/tmp/usr/lib/liboil-0.3.a +debian/tmp/usr/include/liboil-0.3 +debian/tmp/usr/lib/pkgconfig/liboil-0.3.pc +debian/tmp/usr/share/gtk-doc/html/liboil/*.html --- liboil-0.3.13.orig/debian/control +++ liboil-0.3.13/debian/control @@ -0,0 +1,58 @@ +Source: liboil +Section: devel +Priority: optional +Maintainer: Maintainers of GStreamer packages +Uploaders: Sebastian Dröge +Build-Depends: cdbs, debhelper (>= 6), autotools-dev, gtk-doc-tools +Standards-Version: 3.7.3 + +Package: liboil0.3 +Section: libs +Architecture: any +Depends: ${shlibs:Depends} +Description: Library of Optimized Inner Loops + Liboil is a collection of functions that often benefit from having + special implementations on various architectures or CPUs. Each function + in liboil has several implementations which may perform faster or + slower on a given CPU. Some implementations use alternate algorithms, + some use hand-crafted assembly, and some use special instructions that + are only available on certain CPUs, such as MMX, SSE, or Altivec. + The fastest implementation is automatically chosen at runtime. + . + This package contains the liboil shared libraries. It is typically + installed automatically when an application or library requires it. + +Package: liboil0.3-dev +Section: libdevel +Architecture: any +Depends: liboil0.3 (= ${binary:Version}) +Provides: liboil-dev +Description: Library of Optimized Inner Loops (development headers) + Liboil is a collection of functions that often benefit from having + special implementations on various architectures or CPUs. Each function + in liboil has several implementations which may perform faster or + slower on a given CPU. Some implementations use alternate algorithms, + some use hand-crafted assembly, and some use special instructions that + are only available on certain CPUs, such as MMX, SSE, or Altivec. + The fastest implementation is automatically chosen at runtime. + . + This package contains the development headers and libraries, and should + be installed to compile software that uses liboil. + +Package: liboil0.3-dbg +Section: libdevel +Architecture: any +Priority: extra +Depends: liboil0.3 (= ${binary:Version}) +Description: Library of Optimized Inner Loops (debug packages) + Liboil is a collection of functions that often benefit from having + special implementations on various architectures or CPUs. Each function + in liboil has several implementations which may perform faster or + slower on a given CPU. Some implementations use alternate algorithms, + some use hand-crafted assembly, and some use special instructions that + are only available on certain CPUs, such as MMX, SSE, or Altivec. + The fastest implementation is automatically chosen at runtime. + . + This package contains the debugging symbols for the liboil library. + Users should install it if they want to debug software that uses liboil. + --- liboil-0.3.13.orig/debian/rules +++ liboil-0.3.13/debian/rules @@ -0,0 +1,10 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +DEB_DH_STRIP_ARGS := --dbg-package=liboil0.3-dbg +DEB_CONFIGURE_EXTRA_FLAGS := --enable-static + +DEB_MAKE_CHECK_TARGET := check || true --- liboil-0.3.13.orig/debian/watch +++ liboil-0.3.13/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://liboil.freedesktop.org/download/liboil-([0-9.]*).tar.gz --- liboil-0.3.13.orig/debian/changelog +++ liboil-0.3.13/debian/changelog @@ -0,0 +1,193 @@ +liboil (0.3.13-3) unstable; urgency=low + + * debian/control: + + Set priority of the debug package to extra. + * debian/patches/06_alignment-bus-error.patch: + + Dereference float * as float * instead of double *. Fixes several + bus errors on ia64, resulting in a unit suite failure and FTBFS + of many packages build dependending on liboil. + + -- Sebastian Dröge Wed, 27 Feb 2008 11:03:14 +0100 + +liboil (0.3.13-2) unstable; urgency=low + + * debian/rules: + + Call the unit test suite after the build but don't fail the build + if there's an error. + * debian/watch: + + Add watch file. + * debian/patches/05_disable-arm-opt.patch, + debian/patches/99_autoreconf.patch: + + Disable assembler optimizations and special compiler parameters on ARM + completely as there's no runtime detection for the features needed + and this fails to link on arm. + + -- Sebastian Dröge Tue, 26 Feb 2008 12:21:01 +0100 + +liboil (0.3.13-1) unstable; urgency=low + + * New upstream release (Closes: #467251): + + Adds OS detection for GNU/kFreeBSD (Closes: #433025). + + Fixes SEGV if /proc is not mounted on ARM (Closes: #455724). + + Fixes PowerPC FPU test (Closes: #444170). + + debian/liboil0.3.shlibs: + - Update to >= 0.3.13. + * debian/control: + + Package adopted by pkg-gstreamer as David doesn't want to continue + maintaining it. Thanks for all the good work in the past. + + Use ${binary:Version} instead of ${Source-Version}. + + Remove unnecessary build dependency on chrpath. + + Build depend on autotools-dev. + * debian/control, + debian/compat: + + Update to debhelper compat level 6 and Standards-Version 3.7.3. + * debian/bin: + + Removed, not needed. + * debian/patches/01_liboil-linking.patch: + + Link liboil against librt. + * debian/patches/02_ecx-clobbering.patch: + + Add ecx to the clobbered registers on i386, fixes a crash with + pulseaudio. Patch taken from upstream GIT. + * debian/patches/03_jit-compilation.patch: + + Don't compile the JIT example, this needs GLib. + * debian/patches/04_oil-detect-arm-non-static.patch: + + Make the oil_cpu_detect_arch() function non-static to fix the build. + Patch taken from gstreamer-devel by Robert Schwebel. + + -- Sebastian Dröge Tue, 26 Feb 2008 07:21:17 +0100 + +liboil (0.3.12-1) unstable; urgency=low + + * New upstream release (Closes: #427023) + * bump shlibs version (Closes: 420577) + + -- David Schleef Sat, 02 Jun 2007 16:23:16 -0700 + +liboil (0.3.11-1) unstable; urgency=low + + * New upstream release. Changes include fixes to bugs: + - Disable timestamp on XScale (Closes: #410859) + - Merge stack realignment patch into upstream (Closes: #381506) + * Add -dbg package. (Closes: 400163) + + -- David Schleef Sat, 17 Mar 2007 13:18:03 -0700 + +liboil (0.3.10-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Disabled use of system register on StrongArm and XScale processors + (Closes: #410859) + + -- Ben Hutchings Thu, 22 Feb 2007 21:18:15 +0000 + +liboil (0.3.10-1) unstable; urgency=low + + * New upstream release. Changes include fixes to several bugs: + - new cpu detection on amd64 (Closes: #369315) + - Fix merge_linear_u8_mmx() and mt19937_i386_mmx_*() + (Closes: #396328, #369398) + - Alignment fixes for sparc (Closes: #361597) + + -- David Schleef Sat, 04 Nov 2006 17:59:51 -0800 + +liboil (0.3.9-1.2) unstable; urgency=low + + * Non-maintainer upload. + * Fixing the recently introduced FTBFS on amd64. + Thanks for Goswin von Brederlow and Christian Aichinger + for preparation and testing. + + -- Andreas Barth Fri, 23 Jun 2006 09:29:45 +0200 + +liboil (0.3.9-1.1) unstable; urgency=low + + * Non-maintainer upload. + * fix possible unalignment on i386 - this change not perfect + and should also contain a test suite, but is still better + than nothing at all. Thanks to Christian Aichinger for his + good work on this and the patch. Closes: #368991 + (also keeping the patch around in the diff, so that it's + obvious what was changed) + + -- Andreas Barth Thu, 22 Jun 2006 19:31:26 +0200 + +liboil (0.3.9-1) unstable; urgency=low + + * New upstream release. + - Fix a bunch of alignment problems. Should fix a lot of bugs + on relevant architectures (Closes: #361746) + - Recognize SSE again (Closes: #364970) + + -- David Schleef Tue, 23 May 2006 12:54:44 -0700 + +liboil (0.3.8-1) unstable; urgency=low + + * New upstream release. Relevant upstream changes: + - fbCompositeSolid_nx8888mmx was removed (Closes: #340932). I'm + tired of all it's niggly little problems. + + -- David Schleef Wed, 22 Mar 2006 12:39:18 -0800 + +liboil (0.3.6-1) unstable; urgency=low + + * New upstream release. Relevant upstream changes: + - PowerPC build fixes (Closes: #334944) + * Install documentation + + -- David Schleef Mon, 19 Dec 2005 11:57:45 -0800 + +liboil (0.3.3-1) unstable; urgency=low + + * New upstream release. + + -- David Schleef Mon, 03 Oct 2005 12:18:16 -0700 + +liboil (0.3.2-1) unstable; urgency=low + + * New upstream release. + + -- David Schleef Sun, 08 May 2005 17:44:55 -0700 + +liboil (0.3.1-2) unstable; urgency=low + + * Disable buggy profiling MIPS asm + + -- David Schleef Thu, 24 Mar 2005 15:14:54 -0800 + +liboil (0.3.1-1) unstable; urgency=low + + * New upstream release + + -- David Schleef Thu, 17 Mar 2005 17:45:56 -0800 + +liboil (0.3.0-2) unstable; urgency=low + + * Use different package name + + -- David Schleef Mon, 17 Jan 2005 23:56:58 -0800 + +liboil0.3 (0.3.0-1) unstable; urgency=low + + * New upstream release, new ABI. + * Fix package description (Closes: #284486) + + -- David Schleef Thu, 13 Jan 2005 13:22:49 -0800 + +liboil0.2 (0.2.2-1) unstable; urgency=low + + * New upstream. + + -- David Schleef Tue, 23 Nov 2004 19:43:09 -0800 + +liboil0.2 (0.2.1-1) unstable; urgency=low + + * New upstream. Fixes powerpc compile problem. + + -- David Schleef Wed, 17 Nov 2004 21:50:20 -0800 + +liboil0.2 (0.2.0-1) unstable; urgency=low + + * New package. + + -- David Schleef Thu, 04 Nov 2004 18:09:03 -0800 + --- liboil-0.3.13.orig/debian/patches/02_ecx-clobbering.patch +++ liboil-0.3.13/debian/patches/02_ecx-clobbering.patch @@ -0,0 +1,41 @@ +From: David Schleef +Date: Mon, 25 Feb 2008 20:08:30 +0000 (-0800) +Subject: Add ecx to clobbered registers. Fixes #14643 +X-Git-Url: http://gitweb.freedesktop.org/?p=liboil.git;a=commitdiff;h=dbd39644025946a11d659def5b8ae627af8c393b + +Add ecx to clobbered registers. Fixes #14643 +--- + +--- liboil/i386_amd64/copy.c ++++ liboil/i386_amd64/copy.c +@@ -356,7 +356,8 @@ static void splat_u16_ns_mmx (uint16_t * + " emms\n" + : [dest] "+r" (dest), + [n] "+r" (n) +- : [src] "r" (src)); ++ : [src] "r" (src) ++ : "ecx"); + } + OIL_DEFINE_IMPL_FULL (splat_u16_ns_mmx, splat_u16_ns, OIL_IMPL_FLAG_MMX); + +@@ -382,7 +383,8 @@ static void splat_u16_ns_mmx_2 (uint16_t + " emms\n" + : [dest] "+r" (dest), + [n] "+r" (n) +- : [src] "r" (src)); ++ : [src] "r" (src) ++ : "ecx"); + } + OIL_DEFINE_IMPL_FULL (splat_u16_ns_mmx_2, splat_u16_ns, OIL_IMPL_FLAG_MMX); + +@@ -410,7 +412,8 @@ static void splat_u16_ns_mmx_3 (uint16_t + " emms\n" + : [dest] "+r" (dest), + [n] "+r" (n) +- : [src] "r" (src)); ++ : [src] "r" (src) ++ : "ecx"); + } + OIL_DEFINE_IMPL_FULL (splat_u16_ns_mmx_3, splat_u16_ns, OIL_IMPL_FLAG_MMX); + + --- liboil-0.3.13.orig/debian/patches/05_disable-arm-opt.patch +++ liboil-0.3.13/debian/patches/05_disable-arm-opt.patch @@ -0,0 +1,38 @@ +--- configure.ac.old 2008-02-26 12:16:33.000000000 +0100 ++++ configure.ac 2008-02-26 12:16:43.000000000 +0100 +@@ -168,15 +168,6 @@ + true) + fi + +-if test x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes ; then +- AS_COMPILER_FLAG(["-Wa,-mfpu=vfp"], +- [LIBOIL_CFLAGS="$LIBOIL_CFLAGS -mfpu=vfp"], +- true) +- AS_COMPILER_FLAG(["-Wa,-mfloat-abi=softfp"], +- [LIBOIL_CFLAGS="$LIBOIL_CFLAGS -mfloat-abi=softfp"], +- true) +-fi +- + #AS_COMPILER_FLAG(["-fasm-blocks"], HAVE_ASM_BLOCKS=yes, HAVE_ASM_BLOCKS=no) + HAVE_ASM_BLOCKS=no + if test "x$HAVE_ASM_BLOCKS" = "xyes" +--- m4/as-host-defines.m4.old 2008-02-26 12:16:13.000000000 +0100 ++++ m4/as-host-defines.m4 2008-02-26 12:16:27.000000000 +0100 +@@ -23,16 +23,12 @@ + HAVE_POWERPC=yes + AC_DEFINE(HAVE_POWERPC, 1, [Defined if host is powerpc]) + ;; +- xarm) +- HAVE_ARM=yes +- AC_DEFINE(HAVE_ARM, 1, [Defined if host is arm]) +- ;; + esac + + AM_CONDITIONAL(HAVE_I386, test "x$HAVE_I386" = "xyes") + AM_CONDITIONAL(HAVE_AMD64, test "x$HAVE_AMD64" = "xyes") + AM_CONDITIONAL(HAVE_POWERPC, test "x$HAVE_POWERPC" = "xyes") +-AM_CONDITIONAL(HAVE_ARM, test "x$HAVE_ARM" = "xyes") ++AM_CONDITIONAL(HAVE_ARM, false) + + ]) + --- liboil-0.3.13.orig/debian/patches/99_autoreconf.patch +++ liboil-0.3.13/debian/patches/99_autoreconf.patch @@ -0,0 +1,2734 @@ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/aclocal.m4 liboil-0.3.13/aclocal.m4 +--- liboil-0.3.13.old/aclocal.m4 2008-02-22 21:55:56.000000000 +0100 ++++ liboil-0.3.13/aclocal.m4 2008-02-26 12:33:31.000000000 +0100 +@@ -13,7 +13,7 @@ + + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + +-# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL ++# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL + + + # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +@@ -101,7 +101,6 @@ + AC_REQUIRE([AC_OBJEXT])dnl + AC_REQUIRE([AC_EXEEXT])dnl + dnl +- + AC_LIBTOOL_SYS_MAX_CMD_LEN + AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE + AC_LIBTOOL_OBJDIR +@@ -203,6 +202,8 @@ + ;; + esac + ++_LT_REQUIRED_DARWIN_CHECKS ++ + AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) + AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], + enable_win32_dll=yes, enable_win32_dll=no) +@@ -282,9 +283,80 @@ + echo "$lt_simple_link_test_code" >conftest.$ac_ext + eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` +-$rm conftest* ++$rm -r conftest* + ])# _LT_LINKER_BOILERPLATE + ++# _LT_REQUIRED_DARWIN_CHECKS ++# -------------------------- ++# Check for some things on darwin ++AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ ++ case $host_os in ++ rhapsody* | darwin*) ++ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) ++ AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) ++ ++ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], ++ [lt_cv_apple_cc_single_mod=no ++ if test -z "${LT_MULTI_MODULE}"; then ++ # By default we will add the -single_module flag. You can override ++ # by either setting the environment variable LT_MULTI_MODULE ++ # non-empty at configure time, or by adding -multi_module to the ++ # link flags. ++ echo "int foo(void){return 1;}" > conftest.c ++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++ -dynamiclib ${wl}-single_module conftest.c ++ if test -f libconftest.dylib; then ++ lt_cv_apple_cc_single_mod=yes ++ rm -rf libconftest.dylib* ++ fi ++ rm conftest.c ++ fi]) ++ AC_CACHE_CHECK([for -exported_symbols_list linker flag], ++ [lt_cv_ld_exported_symbols_list], ++ [lt_cv_ld_exported_symbols_list=no ++ save_LDFLAGS=$LDFLAGS ++ echo "_main" > conftest.sym ++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], ++ [lt_cv_ld_exported_symbols_list=yes], ++ [lt_cv_ld_exported_symbols_list=no]) ++ LDFLAGS="$save_LDFLAGS" ++ ]) ++ case $host_os in ++ rhapsody* | darwin1.[[0123]]) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; ++ darwin1.*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ darwin*) ++ # if running on 10.5 or later, the deployment target defaults ++ # to the OS version, if on x86, and 10.4, the deployment ++ # target defaults to 10.4. Don't you love it? ++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in ++ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ 10.[[012]]*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ 10.*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ esac ++ ;; ++ esac ++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then ++ _lt_dar_single_mod='$single_module' ++ fi ++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then ++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' ++ else ++ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" ++ fi ++ if test "$DSYMUTIL" != ":"; then ++ _lt_dsymutil="~$DSYMUTIL \$lib || :" ++ else ++ _lt_dsymutil= ++ fi ++ ;; ++ esac ++]) + + # _LT_AC_SYS_LIBPATH_AIX + # ---------------------- +@@ -609,7 +681,11 @@ + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; +- *) LD="${LD-ld} -64" ;; ++ *) ++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then ++ LD="${LD-ld} -64" ++ fi ++ ;; + esac + ;; + esac +@@ -702,7 +778,7 @@ + $2=yes + fi + fi +- $rm conftest* ++ $rm -r conftest* + LDFLAGS="$save_LDFLAGS" + ]) + +@@ -973,7 +1049,7 @@ + AC_CHECK_FUNC([shl_load], + [lt_cv_dlopen="shl_load"], + [AC_CHECK_LIB([dld], [shl_load], +- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], ++ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], + [AC_CHECK_FUNC([dlopen], + [lt_cv_dlopen="dlopen"], + [AC_CHECK_LIB([dl], [dlopen], +@@ -981,7 +1057,7 @@ + [AC_CHECK_LIB([svld], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], + [AC_CHECK_LIB([dld], [dld_link], +- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) ++ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) + ]) + ]) + ]) +@@ -1298,7 +1374,7 @@ + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +-aix4* | aix5*) ++aix[[4-9]]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -1831,6 +1907,13 @@ + AC_MSG_RESULT([$dynamic_linker]) + test "$dynamic_linker" = no && can_build_shared=no + ++AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], ++[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) ++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], ++[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) ++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++ + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" + if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +@@ -2330,7 +2413,7 @@ + # whether `pass_all' will *always* work, you probably want this one. + + case $host_os in +-aix4* | aix5*) ++aix[[4-9]]*) + lt_cv_deplibs_check_method=pass_all + ;; + +@@ -2766,7 +2849,7 @@ + fi + ;; + +-aix4* | aix5*) ++aix[[4-9]]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi +@@ -2823,6 +2906,7 @@ + _LT_AC_TAGVAR(predeps, $1)= + _LT_AC_TAGVAR(postdeps, $1)= + _LT_AC_TAGVAR(compiler_lib_search_path, $1)= ++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= + + # Source file extension for C++ test sources. + ac_ext=cpp +@@ -2932,7 +3016,7 @@ + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +- aix4* | aix5*) ++ aix[[4-9]]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -2945,7 +3029,7 @@ + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. +- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) ++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) +@@ -3091,51 +3175,23 @@ + fi + ;; + darwin* | rhapsody*) +- case $host_os in +- rhapsody* | darwin1.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' +- ;; +- *) # Darwin 1.3 on +- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- else +- case ${MACOSX_DEPLOYMENT_TARGET} in +- 10.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- ;; +- 10.*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' +- ;; +- esac +- fi +- ;; +- esac + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_automatic, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- +- if test "$GXX" = yes ; then +- lt_int_apple_cc_single_mod=no ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" ++ if test "$GXX" = yes ; then + output_verbose_link_cmd='echo' +- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then +- lt_int_apple_cc_single_mod=yes ++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ if test "$lt_cv_apple_cc_single_mod" != "yes"; then ++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" + fi +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- fi +- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- else +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- fi +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + case $cc_basename in + xlc*) +@@ -3386,7 +3442,7 @@ + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + ;; +- pgCC*) ++ pgCC* | pgcpp*) + # Portland Group C++ compiler + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' +@@ -3821,7 +3877,8 @@ + # compiler output when linking a shared library. + # Parse the compiler output and extract the necessary + # objects, libraries and library flags. +-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ ++AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl + dnl we can't use the lt_simple_compile_test_code here, + dnl because it contains code intended for an executable, + dnl not a library. It's possible we should let each +@@ -3946,6 +4003,11 @@ + + $rm -f confest.$objext + ++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= ++if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then ++ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` ++fi ++ + # PORTME: override above test on systems where it is broken + ifelse([$1],[CXX], + [case $host_os in +@@ -4002,7 +4064,6 @@ + ;; + esac + ]) +- + case " $_LT_AC_TAGVAR(postdeps, $1) " in + *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; + esac +@@ -4087,7 +4148,7 @@ + postinstall_cmds='$RANLIB $lib' + fi + ;; +-aix4* | aix5*) ++aix[[4-9]]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi +@@ -4264,6 +4325,7 @@ + _LT_AC_TAGVAR(predeps, $1) \ + _LT_AC_TAGVAR(postdeps, $1) \ + _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ ++ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \ + _LT_AC_TAGVAR(archive_cmds, $1) \ + _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ + _LT_AC_TAGVAR(postinstall_cmds, $1) \ +@@ -4326,7 +4388,7 @@ + # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) + # NOTE: Changes made to this file will be lost: look at ltmain.sh. + # +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 + # Free Software Foundation, Inc. + # + # This file is part of GNU Libtool: +@@ -4563,6 +4625,10 @@ + # shared library. + postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) + ++# The directories searched by this compiler when creating a shared ++# library ++compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) ++ + # The library search path used internally by the compiler when linking + # a shared library. + compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) +@@ -4912,7 +4978,7 @@ + echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD + cat conftest.$ac_ext >&5 + fi +- rm -f conftest* conftst* ++ rm -rf conftest* conftst* + + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then +@@ -4969,7 +5035,8 @@ + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ++ m4_if([$1], [GCJ], [], ++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + darwin* | rhapsody*) + # PIC is the default on this platform +@@ -5006,7 +5073,7 @@ + esac + else + case $host_os in +- aix4* | aix5*) ++ aix[[4-9]]*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor +@@ -5102,7 +5169,7 @@ + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; +- pgCC*) ++ pgCC* | pgcpp*) + # Portland Group C++ compiler. + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' +@@ -5253,7 +5320,8 @@ + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ++ m4_if([$1], [GCJ], [], ++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + + darwin* | rhapsody*) +@@ -5323,7 +5391,8 @@ + mingw* | cygwin* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ++ m4_if([$1], [GCJ], [], ++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + + hpux9* | hpux10* | hpux11*) +@@ -5460,7 +5529,7 @@ + # + if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then + AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], +- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), ++ _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), + [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], + [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in + "" | " "*) ;; +@@ -5484,7 +5553,7 @@ + # + wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" + AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], +- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), ++ _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), + $lt_tmp_static_flag, + [], + [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) +@@ -5500,7 +5569,7 @@ + ifelse([$1],[CXX],[ + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + case $host_os in +- aix4* | aix5*) ++ aix[[4-9]]*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | grep 'GNU' > /dev/null; then +@@ -5522,6 +5591,7 @@ + _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)= +@@ -5552,12 +5622,14 @@ + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. +- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" ++ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. ++ # Exclude shared library initialization/finalization symbols. ++dnl Note also adjust exclude_expsyms for C++ above. + extract_expsyms_cmds= + # Just being paranoid about ensuring that cc_basename is set. + _LT_CC_BASENAME([$compiler]) +@@ -5607,7 +5679,7 @@ + + # See if GNU ld supports shared libraries. + case $host_os in +- aix3* | aix4* | aix5*) ++ aix[[3-9]]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + _LT_AC_TAGVAR(ld_shlibs, $1)=no +@@ -5827,7 +5899,7 @@ + fi + ;; + +- aix4* | aix5*) ++ aix[[4-9]]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -5847,7 +5919,7 @@ + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. +- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) ++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes +@@ -6007,11 +6079,10 @@ + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + if test "$GCC" = yes ; then + output_verbose_link_cmd='echo' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + else + case $cc_basename in + xlc*) +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/config.h.in liboil-0.3.13/config.h.in +--- liboil-0.3.13.old/config.h.in 2008-02-22 21:56:10.000000000 +0100 ++++ liboil-0.3.13/config.h.in 2008-02-26 12:33:37.000000000 +0100 +@@ -9,9 +9,6 @@ + /* Defined if host is amd64 */ + #undef HAVE_AMD64 + +-/* Defined if host is arm */ +-#undef HAVE_ARM +- + /* Defined if we have clock_gettime() */ + #undef HAVE_CLOCK_GETTIME + +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/configure liboil-0.3.13/configure +--- liboil-0.3.13.old/configure 2008-02-22 21:56:03.000000000 +0100 ++++ liboil-0.3.13/configure 2008-02-26 12:33:35.000000000 +0100 +@@ -857,6 +857,8 @@ + ECHO + AR + RANLIB ++DSYMUTIL ++NMEDIT + DLLTOOL + AS + OBJDUMP +@@ -4197,7 +4199,7 @@ + # whether `pass_all' will *always* work, you probably want this one. + + case $host_os in +-aix4* | aix5*) ++aix[4-9]*) + lt_cv_deplibs_check_method=pass_all + ;; + +@@ -4413,7 +4415,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 4416 "configure"' > conftest.$ac_ext ++ echo '#line 4418 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -4585,7 +4587,11 @@ + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; +- *) LD="${LD-ld} -64" ;; ++ *) ++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then ++ LD="${LD-ld} -64" ++ fi ++ ;; + esac + ;; + esac +@@ -5505,7 +5511,6 @@ + + + # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! +- + # find the maximum length of command line arguments + { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 + echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } +@@ -5820,7 +5825,7 @@ + echo "$progname: failed program was:" >&5 + cat conftest.$ac_ext >&5 + fi +- rm -f conftest* conftst* ++ rm -rf conftest* conftst* + + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then +@@ -6380,6 +6385,318 @@ + ;; + esac + ++ ++ case $host_os in ++ rhapsody* | darwin*) ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. ++set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_DSYMUTIL+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$DSYMUTIL"; then ++ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++DSYMUTIL=$ac_cv_prog_DSYMUTIL ++if test -n "$DSYMUTIL"; then ++ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 ++echo "${ECHO_T}$DSYMUTIL" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_DSYMUTIL"; then ++ ac_ct_DSYMUTIL=$DSYMUTIL ++ # Extract the first word of "dsymutil", so it can be a program name with args. ++set dummy dsymutil; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_DSYMUTIL"; then ++ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL ++if test -n "$ac_ct_DSYMUTIL"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 ++echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ if test "x$ac_ct_DSYMUTIL" = x; then ++ DSYMUTIL=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ DSYMUTIL=$ac_ct_DSYMUTIL ++ fi ++else ++ DSYMUTIL="$ac_cv_prog_DSYMUTIL" ++fi ++ ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. ++set dummy ${ac_tool_prefix}nmedit; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_NMEDIT+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$NMEDIT"; then ++ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++NMEDIT=$ac_cv_prog_NMEDIT ++if test -n "$NMEDIT"; then ++ { echo "$as_me:$LINENO: result: $NMEDIT" >&5 ++echo "${ECHO_T}$NMEDIT" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_NMEDIT"; then ++ ac_ct_NMEDIT=$NMEDIT ++ # Extract the first word of "nmedit", so it can be a program name with args. ++set dummy nmedit; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_NMEDIT"; then ++ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_NMEDIT="nmedit" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT ++if test -n "$ac_ct_NMEDIT"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 ++echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ if test "x$ac_ct_NMEDIT" = x; then ++ NMEDIT=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ NMEDIT=$ac_ct_NMEDIT ++ fi ++else ++ NMEDIT="$ac_cv_prog_NMEDIT" ++fi ++ ++ ++ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 ++echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } ++if test "${lt_cv_apple_cc_single_mod+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_apple_cc_single_mod=no ++ if test -z "${LT_MULTI_MODULE}"; then ++ # By default we will add the -single_module flag. You can override ++ # by either setting the environment variable LT_MULTI_MODULE ++ # non-empty at configure time, or by adding -multi_module to the ++ # link flags. ++ echo "int foo(void){return 1;}" > conftest.c ++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++ -dynamiclib ${wl}-single_module conftest.c ++ if test -f libconftest.dylib; then ++ lt_cv_apple_cc_single_mod=yes ++ rm -rf libconftest.dylib* ++ fi ++ rm conftest.c ++ fi ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 ++echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; } ++ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 ++echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; } ++if test "${lt_cv_ld_exported_symbols_list+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_ld_exported_symbols_list=no ++ save_LDFLAGS=$LDFLAGS ++ echo "_main" > conftest.sym ++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then ++ lt_cv_ld_exported_symbols_list=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ lt_cv_ld_exported_symbols_list=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++ LDFLAGS="$save_LDFLAGS" ++ ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 ++echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } ++ case $host_os in ++ rhapsody* | darwin1.[0123]) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; ++ darwin1.*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ darwin*) ++ # if running on 10.5 or later, the deployment target defaults ++ # to the OS version, if on x86, and 10.4, the deployment ++ # target defaults to 10.4. Don't you love it? ++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in ++ 10.0,*86*-darwin8*|10.0,*-darwin[91]*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ 10.[012]*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ 10.*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ esac ++ ;; ++ esac ++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then ++ _lt_dar_single_mod='$single_module' ++ fi ++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then ++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' ++ else ++ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" ++ fi ++ if test "$DSYMUTIL" != ":"; then ++ _lt_dsymutil="~$DSYMUTIL \$lib || :" ++ else ++ _lt_dsymutil= ++ fi ++ ;; ++ esac ++ ++ + enable_dlopen=no + enable_win32_dll=yes + +@@ -6445,7 +6762,7 @@ + echo "$lt_simple_link_test_code" >conftest.$ac_ext + eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` +-$rm conftest* ++$rm -r conftest* + + + +@@ -6473,11 +6790,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:6476: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:6793: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:6480: \$? = $ac_status" >&5 ++ echo "$as_me:6797: \$? = $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. +@@ -6747,10 +7064,10 @@ + + { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 + echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } +-if test "${lt_prog_compiler_pic_works+set}" = set; then ++if test "${lt_cv_prog_compiler_pic_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- lt_prog_compiler_pic_works=no ++ lt_cv_prog_compiler_pic_works=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" +@@ -6763,27 +7080,27 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:6766: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7083: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:6770: \$? = $ac_status" >&5 ++ echo "$as_me:7087: \$? = $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" ;; +@@ -6810,10 +7127,10 @@ + wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" + { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 + echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +-if test "${lt_prog_compiler_static_works+set}" = set; then ++if test "${lt_cv_prog_compiler_static_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- lt_prog_compiler_static_works=no ++ lt_cv_prog_compiler_static_works=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext +@@ -6826,20 +7143,20 @@ + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then +- lt_prog_compiler_static_works=yes ++ lt_cv_prog_compiler_static_works=yes + fi + else +- lt_prog_compiler_static_works=yes ++ lt_cv_prog_compiler_static_works=yes + fi + fi +- $rm conftest* ++ $rm -r conftest* + LDFLAGS="$save_LDFLAGS" + + fi +-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 +-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } + +-if test x"$lt_prog_compiler_static_works" = xyes; then ++if test x"$lt_cv_prog_compiler_static_works" = xyes; then + : + else + lt_prog_compiler_static= +@@ -6867,11 +7184,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:6870: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7187: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:6874: \$? = $ac_status" >&5 ++ echo "$as_me:7191: \$? = $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 +@@ -6951,12 +7268,13 @@ + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. +- exclude_expsyms="_GLOBAL_OFFSET_TABLE_" ++ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. ++ # Exclude shared library initialization/finalization symbols. + extract_expsyms_cmds= + # Just being paranoid about ensuring that cc_basename is set. + for cc_temp in $compiler""; do +@@ -7015,7 +7333,7 @@ + + # See if GNU ld supports shared libraries. + case $host_os in +- aix3* | aix4* | aix5*) ++ aix[3-9]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs=no +@@ -7235,7 +7553,7 @@ + fi + ;; + +- aix4* | aix5*) ++ aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -7255,7 +7573,7 @@ + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. +- case $host_os in aix4.[23]|aix4.[23].*|aix5*) ++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes +@@ -7527,11 +7845,10 @@ + link_all_deplibs=yes + if test "$GCC" = yes ; then + output_verbose_link_cmd='echo' +- archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds +- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + else + case $cc_basename in + xlc*) +@@ -8051,7 +8368,7 @@ + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +-aix4* | aix5*) ++aix[4-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -8585,6 +8902,21 @@ + echo "${ECHO_T}$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + ++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" ++fi ++ ++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" ++fi ++ ++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++ + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" + if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +@@ -8904,7 +9236,7 @@ + { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 + echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } + if test $ac_cv_lib_dld_shl_load = yes; then +- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" ++ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" + else + { echo "$as_me:$LINENO: checking for dlopen" >&5 + echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } +@@ -9180,7 +9512,7 @@ + { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 + echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } + if test $ac_cv_lib_dld_dld_link = yes; then +- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" ++ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" + fi + + +@@ -9229,7 +9561,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <>confdefs.h <<\_ACEOF +-#define HAVE_ARM 1 +-_ACEOF +- +- ;; + esac + + +@@ -10584,7 +10913,7 @@ + + + +-if test "x$HAVE_ARM" = "xyes"; then ++if false; then + HAVE_ARM_TRUE= + HAVE_ARM_FALSE='#' + else +@@ -15722,129 +16051,6 @@ + + fi + +-if test x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes ; then +- +- { echo "$as_me:$LINENO: checking to see if compiler understands \"-Wa,-mfpu=vfp\"" >&5 +-echo $ECHO_N "checking to see if compiler understands \"-Wa,-mfpu=vfp\"... $ECHO_C" >&6; } +- +- save_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS "-Wa,-mfpu=vfp"" +- +- 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 +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- flag_ok=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- flag_ok=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- CFLAGS="$save_CFLAGS" +- +- if test "X$flag_ok" = Xyes ; then +- LIBOIL_CFLAGS="$LIBOIL_CFLAGS -mfpu=vfp" +- true +- else +- true +- true +- fi +- { echo "$as_me:$LINENO: result: $flag_ok" >&5 +-echo "${ECHO_T}$flag_ok" >&6; } +- +- +- { echo "$as_me:$LINENO: checking to see if compiler understands \"-Wa,-mfloat-abi=softfp\"" >&5 +-echo $ECHO_N "checking to see if compiler understands \"-Wa,-mfloat-abi=softfp\"... $ECHO_C" >&6; } +- +- save_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS "-Wa,-mfloat-abi=softfp"" +- +- 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 +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- flag_ok=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- flag_ok=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- CFLAGS="$save_CFLAGS" +- +- if test "X$flag_ok" = Xyes ; then +- LIBOIL_CFLAGS="$LIBOIL_CFLAGS -mfloat-abi=softfp" +- true +- else +- true +- true +- fi +- { echo "$as_me:$LINENO: result: $flag_ok" >&5 +-echo "${ECHO_T}$flag_ok" >&6; } +- +-fi +- + #AS_COMPILER_FLAG(["-fasm-blocks"], HAVE_ASM_BLOCKS=yes, HAVE_ASM_BLOCKS=no) + HAVE_ASM_BLOCKS=no + if test "x$HAVE_ASM_BLOCKS" = "xyes" +@@ -17318,9 +17524,9 @@ + 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 + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -17362,6 +17568,8 @@ + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF ++AS!$AS$ac_delim ++OBJDUMP!$OBJDUMP$ac_delim + CPP!$CPP$ac_delim + LIBTOOL!$LIBTOOL$ac_delim + CCAS!$CCAS$ac_delim +@@ -17429,7 +17637,7 @@ + LTLIBOBJS!$LTLIBOBJS$ac_delim + _ACEOF + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 65; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 67; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/doc/Makefile.in liboil-0.3.13/doc/Makefile.in +--- liboil-0.3.13.old/doc/Makefile.in 2008-02-22 21:55:58.000000000 +0100 ++++ liboil-0.3.13/doc/Makefile.in 2008-02-26 12:33:39.000000000 +0100 +@@ -85,6 +85,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -154,6 +155,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -327,9 +329,9 @@ + 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 \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/examples/audioresample/Makefile.in liboil-0.3.13/examples/audioresample/Makefile.in +--- liboil-0.3.13.old/examples/audioresample/Makefile.in 2008-02-22 21:55:58.000000000 +0100 ++++ liboil-0.3.13/examples/audioresample/Makefile.in 2008-02-26 12:33:40.000000000 +0100 +@@ -110,6 +110,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -179,6 +180,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -273,9 +275,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/audioresample/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/audioresample/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign examples/audioresample/Makefile ++ $(AUTOMAKE) --gnu examples/audioresample/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/examples/huffman/Makefile.in liboil-0.3.13/examples/huffman/Makefile.in +--- liboil-0.3.13.old/examples/huffman/Makefile.in 2008-02-22 21:55:58.000000000 +0100 ++++ liboil-0.3.13/examples/huffman/Makefile.in 2008-02-26 12:33:40.000000000 +0100 +@@ -98,6 +98,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -167,6 +168,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -256,9 +258,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/huffman/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/huffman/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign examples/huffman/Makefile ++ $(AUTOMAKE) --gnu examples/huffman/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/examples/jit/Makefile.in liboil-0.3.13/examples/jit/Makefile.in +--- liboil-0.3.13.old/examples/jit/Makefile.in 2008-02-22 21:55:58.000000000 +0100 ++++ liboil-0.3.13/examples/jit/Makefile.in 2008-02-26 12:33:40.000000000 +0100 +@@ -98,6 +98,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -167,6 +168,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -252,9 +254,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/jit/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/jit/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign examples/jit/Makefile ++ $(AUTOMAKE) --gnu examples/jit/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/examples/jpeg/Makefile.in liboil-0.3.13/examples/jpeg/Makefile.in +--- liboil-0.3.13.old/examples/jpeg/Makefile.in 2008-02-22 21:55:58.000000000 +0100 ++++ liboil-0.3.13/examples/jpeg/Makefile.in 2008-02-26 12:33:40.000000000 +0100 +@@ -113,6 +113,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -182,6 +183,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -286,9 +288,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/jpeg/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/jpeg/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign examples/jpeg/Makefile ++ $(AUTOMAKE) --gnu examples/jpeg/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/examples/Makefile.in liboil-0.3.13/examples/Makefile.in +--- liboil-0.3.13.old/examples/Makefile.in 2008-02-22 21:55:58.000000000 +0100 ++++ liboil-0.3.13/examples/Makefile.in 2008-02-26 12:33:39.000000000 +0100 +@@ -149,6 +149,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -218,6 +219,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -287,7 +289,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-SUBDIRS = jpeg md5 uberopt work huffman taylor videoscale audioresample jit ++SUBDIRS = jpeg md5 uberopt work huffman taylor videoscale audioresample + example1_SOURCES = example1.c + example1_CFLAGS = $(LIBOIL_CFLAGS) + example1_LDADD = $(LIBOIL_LIBS) +@@ -334,9 +336,9 @@ + 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 \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/examples/md5/Makefile.in liboil-0.3.13/examples/md5/Makefile.in +--- liboil-0.3.13.old/examples/md5/Makefile.in 2008-02-22 21:55:58.000000000 +0100 ++++ liboil-0.3.13/examples/md5/Makefile.in 2008-02-26 12:33:41.000000000 +0100 +@@ -98,6 +98,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -167,6 +168,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -252,9 +254,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/md5/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/md5/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign examples/md5/Makefile ++ $(AUTOMAKE) --gnu examples/md5/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/examples/taylor/Makefile.in liboil-0.3.13/examples/taylor/Makefile.in +--- liboil-0.3.13.old/examples/taylor/Makefile.in 2008-02-22 21:55:58.000000000 +0100 ++++ liboil-0.3.13/examples/taylor/Makefile.in 2008-02-26 12:33:41.000000000 +0100 +@@ -98,6 +98,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -167,6 +168,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -252,9 +254,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/taylor/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/taylor/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign examples/taylor/Makefile ++ $(AUTOMAKE) --gnu examples/taylor/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/examples/uberopt/Makefile.in liboil-0.3.13/examples/uberopt/Makefile.in +--- liboil-0.3.13.old/examples/uberopt/Makefile.in 2008-02-22 21:55:58.000000000 +0100 ++++ liboil-0.3.13/examples/uberopt/Makefile.in 2008-02-26 12:33:42.000000000 +0100 +@@ -98,6 +98,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -167,6 +168,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -253,9 +255,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/uberopt/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/uberopt/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign examples/uberopt/Makefile ++ $(AUTOMAKE) --gnu examples/uberopt/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/examples/videoscale/Makefile.in liboil-0.3.13/examples/videoscale/Makefile.in +--- liboil-0.3.13.old/examples/videoscale/Makefile.in 2008-02-22 21:55:59.000000000 +0100 ++++ liboil-0.3.13/examples/videoscale/Makefile.in 2008-02-26 12:33:42.000000000 +0100 +@@ -100,6 +100,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -169,6 +170,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -256,9 +258,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/videoscale/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/videoscale/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign examples/videoscale/Makefile ++ $(AUTOMAKE) --gnu examples/videoscale/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/examples/work/Makefile.in liboil-0.3.13/examples/work/Makefile.in +--- liboil-0.3.13.old/examples/work/Makefile.in 2008-02-22 21:55:59.000000000 +0100 ++++ liboil-0.3.13/examples/work/Makefile.in 2008-02-26 12:33:42.000000000 +0100 +@@ -97,6 +97,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -166,6 +167,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -251,9 +253,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/work/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/work/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign examples/work/Makefile ++ $(AUTOMAKE) --gnu examples/work/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/liboil/3dnow/Makefile.in liboil-0.3.13/liboil/3dnow/Makefile.in +--- liboil-0.3.13.old/liboil/3dnow/Makefile.in 2008-02-22 21:55:59.000000000 +0100 ++++ liboil-0.3.13/liboil/3dnow/Makefile.in 2008-02-26 12:33:43.000000000 +0100 +@@ -78,6 +78,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -147,6 +148,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -228,9 +230,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign liboil/3dnow/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu liboil/3dnow/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign liboil/3dnow/Makefile ++ $(AUTOMAKE) --gnu liboil/3dnow/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/liboil/amd64/Makefile.in liboil-0.3.13/liboil/amd64/Makefile.in +--- liboil-0.3.13.old/liboil/amd64/Makefile.in 2008-02-22 21:55:59.000000000 +0100 ++++ liboil-0.3.13/liboil/amd64/Makefile.in 2008-02-26 12:33:44.000000000 +0100 +@@ -96,6 +96,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -165,6 +166,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -252,9 +254,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign liboil/amd64/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu liboil/amd64/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign liboil/amd64/Makefile ++ $(AUTOMAKE) --gnu liboil/amd64/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/liboil/arm/Makefile.in liboil-0.3.13/liboil/arm/Makefile.in +--- liboil-0.3.13.old/liboil/arm/Makefile.in 2008-02-22 21:55:59.000000000 +0100 ++++ liboil-0.3.13/liboil/arm/Makefile.in 2008-02-26 12:33:44.000000000 +0100 +@@ -99,6 +99,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -168,6 +169,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -256,9 +258,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign liboil/arm/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu liboil/arm/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign liboil/arm/Makefile ++ $(AUTOMAKE) --gnu liboil/arm/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/liboil/c/Makefile.in liboil-0.3.13/liboil/c/Makefile.in +--- liboil-0.3.13.old/liboil/c/Makefile.in 2008-02-22 21:55:59.000000000 +0100 ++++ liboil-0.3.13/liboil/c/Makefile.in 2008-02-26 12:33:44.000000000 +0100 +@@ -106,6 +106,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -175,6 +176,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -279,9 +281,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign liboil/c/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu liboil/c/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign liboil/c/Makefile ++ $(AUTOMAKE) --gnu liboil/c/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/liboil/colorspace/Makefile.in liboil-0.3.13/liboil/colorspace/Makefile.in +--- liboil-0.3.13.old/liboil/colorspace/Makefile.in 2008-02-22 21:56:00.000000000 +0100 ++++ liboil-0.3.13/liboil/colorspace/Makefile.in 2008-02-26 12:33:45.000000000 +0100 +@@ -104,6 +104,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -173,6 +174,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -271,9 +273,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign liboil/colorspace/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu liboil/colorspace/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign liboil/colorspace/Makefile ++ $(AUTOMAKE) --gnu liboil/colorspace/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/liboil/conv/Makefile.in liboil-0.3.13/liboil/conv/Makefile.in +--- liboil-0.3.13.old/liboil/conv/Makefile.in 2008-02-22 21:56:00.000000000 +0100 ++++ liboil-0.3.13/liboil/conv/Makefile.in 2008-02-26 12:33:45.000000000 +0100 +@@ -108,6 +108,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -177,6 +178,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -275,9 +277,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign liboil/conv/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu liboil/conv/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign liboil/conv/Makefile ++ $(AUTOMAKE) --gnu liboil/conv/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/liboil/copy/Makefile.in liboil-0.3.13/liboil/copy/Makefile.in +--- liboil-0.3.13.old/liboil/copy/Makefile.in 2008-02-22 21:56:00.000000000 +0100 ++++ liboil-0.3.13/liboil/copy/Makefile.in 2008-02-26 12:33:45.000000000 +0100 +@@ -105,6 +105,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -174,6 +175,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -275,9 +277,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign liboil/copy/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu liboil/copy/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign liboil/copy/Makefile ++ $(AUTOMAKE) --gnu liboil/copy/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/liboil/dct/Makefile.in liboil-0.3.13/liboil/dct/Makefile.in +--- liboil-0.3.13.old/liboil/dct/Makefile.in 2008-02-22 21:56:00.000000000 +0100 ++++ liboil-0.3.13/liboil/dct/Makefile.in 2008-02-26 12:33:46.000000000 +0100 +@@ -115,6 +115,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -184,6 +185,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -293,9 +295,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign liboil/dct/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu liboil/dct/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign liboil/dct/Makefile ++ $(AUTOMAKE) --gnu liboil/dct/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/liboil/deprecated/Makefile.in liboil-0.3.13/liboil/deprecated/Makefile.in +--- liboil-0.3.13.old/liboil/deprecated/Makefile.in 2008-02-22 21:56:00.000000000 +0100 ++++ liboil-0.3.13/liboil/deprecated/Makefile.in 2008-02-26 12:33:47.000000000 +0100 +@@ -103,6 +103,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -172,6 +173,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -273,9 +275,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign liboil/deprecated/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu liboil/deprecated/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign liboil/deprecated/Makefile ++ $(AUTOMAKE) --gnu liboil/deprecated/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/liboil/fb/Makefile.in liboil-0.3.13/liboil/fb/Makefile.in +--- liboil-0.3.13.old/liboil/fb/Makefile.in 2008-02-22 21:56:01.000000000 +0100 ++++ liboil-0.3.13/liboil/fb/Makefile.in 2008-02-26 12:33:47.000000000 +0100 +@@ -99,6 +99,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -168,6 +169,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -257,9 +259,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign liboil/fb/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu liboil/fb/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign liboil/fb/Makefile ++ $(AUTOMAKE) --gnu liboil/fb/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/liboil/i386/Makefile.in liboil-0.3.13/liboil/i386/Makefile.in +--- liboil-0.3.13.old/liboil/i386/Makefile.in 2008-02-22 21:56:01.000000000 +0100 ++++ liboil-0.3.13/liboil/i386/Makefile.in 2008-02-26 12:33:48.000000000 +0100 +@@ -116,6 +116,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -185,6 +186,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -274,9 +276,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign liboil/i386/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu liboil/i386/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign liboil/i386/Makefile ++ $(AUTOMAKE) --gnu liboil/i386/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/liboil/i386_amd64/Makefile.in liboil-0.3.13/liboil/i386_amd64/Makefile.in +--- liboil-0.3.13.old/liboil/i386_amd64/Makefile.in 2008-02-22 21:56:01.000000000 +0100 ++++ liboil-0.3.13/liboil/i386_amd64/Makefile.in 2008-02-26 12:33:49.000000000 +0100 +@@ -103,6 +103,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -172,6 +173,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -273,9 +275,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign liboil/i386_amd64/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu liboil/i386_amd64/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign liboil/i386_amd64/Makefile ++ $(AUTOMAKE) --gnu liboil/i386_amd64/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/liboil/jpeg/Makefile.in liboil-0.3.13/liboil/jpeg/Makefile.in +--- liboil-0.3.13.old/liboil/jpeg/Makefile.in 2008-02-22 21:56:01.000000000 +0100 ++++ liboil-0.3.13/liboil/jpeg/Makefile.in 2008-02-26 12:33:49.000000000 +0100 +@@ -111,6 +111,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -180,6 +181,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -281,9 +283,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign liboil/jpeg/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu liboil/jpeg/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign liboil/jpeg/Makefile ++ $(AUTOMAKE) --gnu liboil/jpeg/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/liboil/Makefile.in liboil-0.3.13/liboil/Makefile.in +--- liboil-0.3.13.old/liboil/Makefile.in 2008-02-22 21:55:59.000000000 +0100 ++++ liboil-0.3.13/liboil/Makefile.in 2008-02-26 12:33:43.000000000 +0100 +@@ -102,7 +102,7 @@ + $(noinst_LTLIBRARIES) + am__DEPENDENCIES_1 = + liboil_@LIBOIL_MAJORMINOR@_la_DEPENDENCIES = liboilfunctions.la \ +- $(am__DEPENDENCIES_1) ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + am__liboil_@LIBOIL_MAJORMINOR@_la_SOURCES_DIST = liboil.h \ + liboilcolorspace.h liboilcpu.c liboildebug.c liboildebug.h \ + liboilfault.c liboilfault.h liboilfuncs.h liboilfunction.c \ +@@ -253,6 +253,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -322,6 +323,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -448,7 +450,8 @@ + + liboil_@LIBOIL_MAJORMINOR@_la_LIBADD = \ + liboilfunctions.la \ +- $(LIBM) ++ $(LIBM) \ ++ $(LIBRT) + + liboil_@LIBOIL_MAJORMINOR@_la_CFLAGS = $(LIBOIL_CFLAGS) + liboil_@LIBOIL_MAJORMINOR@_la_LDFLAGS = \ +@@ -506,9 +509,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign liboil/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu liboil/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign liboil/Makefile ++ $(AUTOMAKE) --gnu liboil/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/liboil/math/Makefile.in liboil-0.3.13/liboil/math/Makefile.in +--- liboil-0.3.13.old/liboil/math/Makefile.in 2008-02-22 21:56:01.000000000 +0100 ++++ liboil-0.3.13/liboil/math/Makefile.in 2008-02-26 12:33:50.000000000 +0100 +@@ -101,6 +101,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -170,6 +171,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -261,9 +263,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign liboil/math/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu liboil/math/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign liboil/math/Makefile ++ $(AUTOMAKE) --gnu liboil/math/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/liboil/md5/Makefile.in liboil-0.3.13/liboil/md5/Makefile.in +--- liboil-0.3.13.old/liboil/md5/Makefile.in 2008-02-22 21:56:01.000000000 +0100 ++++ liboil-0.3.13/liboil/md5/Makefile.in 2008-02-26 12:33:50.000000000 +0100 +@@ -106,6 +106,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -175,6 +176,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -269,9 +271,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign liboil/md5/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu liboil/md5/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign liboil/md5/Makefile ++ $(AUTOMAKE) --gnu liboil/md5/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/liboil/mmx/Makefile.in liboil-0.3.13/liboil/mmx/Makefile.in +--- liboil-0.3.13.old/liboil/mmx/Makefile.in 2008-02-22 21:56:01.000000000 +0100 ++++ liboil-0.3.13/liboil/mmx/Makefile.in 2008-02-26 12:33:50.000000000 +0100 +@@ -98,6 +98,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -167,6 +168,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -257,9 +259,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign liboil/mmx/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu liboil/mmx/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign liboil/mmx/Makefile ++ $(AUTOMAKE) --gnu liboil/mmx/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/liboil/motovec/Makefile.in liboil-0.3.13/liboil/motovec/Makefile.in +--- liboil-0.3.13.old/liboil/motovec/Makefile.in 2008-02-22 21:56:02.000000000 +0100 ++++ liboil-0.3.13/liboil/motovec/Makefile.in 2008-02-26 12:33:51.000000000 +0100 +@@ -100,6 +100,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -169,6 +170,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -260,9 +262,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign liboil/motovec/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu liboil/motovec/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign liboil/motovec/Makefile ++ $(AUTOMAKE) --gnu liboil/motovec/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/liboil/powerpc/Makefile.in liboil-0.3.13/liboil/powerpc/Makefile.in +--- liboil-0.3.13.old/liboil/powerpc/Makefile.in 2008-02-22 21:56:02.000000000 +0100 ++++ liboil-0.3.13/liboil/powerpc/Makefile.in 2008-02-26 12:33:51.000000000 +0100 +@@ -103,6 +103,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -172,6 +173,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -274,9 +276,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign liboil/powerpc/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu liboil/powerpc/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign liboil/powerpc/Makefile ++ $(AUTOMAKE) --gnu liboil/powerpc/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/liboil/powerpc_asm_blocks/Makefile.in liboil-0.3.13/liboil/powerpc_asm_blocks/Makefile.in +--- liboil-0.3.13.old/liboil/powerpc_asm_blocks/Makefile.in 2008-02-22 21:56:02.000000000 +0100 ++++ liboil-0.3.13/liboil/powerpc_asm_blocks/Makefile.in 2008-02-26 12:33:52.000000000 +0100 +@@ -100,6 +100,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -169,6 +170,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -261,9 +263,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign liboil/powerpc_asm_blocks/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu liboil/powerpc_asm_blocks/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign liboil/powerpc_asm_blocks/Makefile ++ $(AUTOMAKE) --gnu liboil/powerpc_asm_blocks/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/liboil/ref/Makefile.in liboil-0.3.13/liboil/ref/Makefile.in +--- liboil-0.3.13.old/liboil/ref/Makefile.in 2008-02-22 21:56:02.000000000 +0100 ++++ liboil-0.3.13/liboil/ref/Makefile.in 2008-02-26 12:33:54.000000000 +0100 +@@ -134,6 +134,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -203,6 +204,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -336,9 +338,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign liboil/ref/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu liboil/ref/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign liboil/ref/Makefile ++ $(AUTOMAKE) --gnu liboil/ref/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/liboil/simdpack/Makefile.in liboil-0.3.13/liboil/simdpack/Makefile.in +--- liboil-0.3.13.old/liboil/simdpack/Makefile.in 2008-02-22 21:56:02.000000000 +0100 ++++ liboil-0.3.13/liboil/simdpack/Makefile.in 2008-02-26 12:33:56.000000000 +0100 +@@ -137,6 +137,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -206,6 +207,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -307,9 +309,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign liboil/simdpack/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu liboil/simdpack/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign liboil/simdpack/Makefile ++ $(AUTOMAKE) --gnu liboil/simdpack/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/liboil/sse/Makefile.in liboil-0.3.13/liboil/sse/Makefile.in +--- liboil-0.3.13.old/liboil/sse/Makefile.in 2008-02-22 21:56:03.000000000 +0100 ++++ liboil-0.3.13/liboil/sse/Makefile.in 2008-02-26 12:33:57.000000000 +0100 +@@ -101,6 +101,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -170,6 +171,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -267,9 +269,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign liboil/sse/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu liboil/sse/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign liboil/sse/Makefile ++ $(AUTOMAKE) --gnu liboil/sse/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/liboil/utf8/Makefile.in liboil-0.3.13/liboil/utf8/Makefile.in +--- liboil-0.3.13.old/liboil/utf8/Makefile.in 2008-02-22 21:56:03.000000000 +0100 ++++ liboil-0.3.13/liboil/utf8/Makefile.in 2008-02-26 12:33:58.000000000 +0100 +@@ -105,6 +105,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -174,6 +175,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -267,9 +269,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign liboil/utf8/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu liboil/utf8/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign liboil/utf8/Makefile ++ $(AUTOMAKE) --gnu liboil/utf8/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/ltmain.sh liboil-0.3.13/ltmain.sh +--- liboil-0.3.13.old/ltmain.sh 2007-08-14 19:43:36.000000000 +0200 ++++ liboil-0.3.13/ltmain.sh 2008-02-02 14:28:24.000000000 +0100 +@@ -2,7 +2,7 @@ + # NOTE: Changing this file will not affect anything until you rerun configure. + # + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, +-# 2007 Free Software Foundation, Inc. ++# 2007, 2008 Free Software Foundation, Inc. + # Originally by Gordon Matzigkeit , 1996 + # + # This program is free software; you can redistribute it and/or modify +@@ -43,8 +43,8 @@ + + PROGRAM=ltmain.sh + PACKAGE=libtool +-VERSION="1.5.24 Debian 1.5.24-1ubuntu1" +-TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)" ++VERSION="1.5.26 Debian 1.5.26-1" ++TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)" + + # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +@@ -113,15 +113,21 @@ + # These must not be set unconditionally because not all systems understand + # e.g. LANG=C (notably SCO). + # We save the old values to restore during execute mode. +-for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES ++lt_env= ++for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES + do + eval "if test \"\${$lt_var+set}\" = set; then + save_$lt_var=\$$lt_var ++ lt_env=\"$lt_var=\$$lt_var \$lt_env\" + $lt_var=C + export $lt_var + fi" + done + ++if test -n "$lt_env"; then ++ lt_env="env $lt_env" ++fi ++ + # Make sure IFS has a sensible default + lt_nl=' + ' +@@ -485,7 +491,7 @@ + echo "\ + $PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP + +-Copyright (C) 2007 Free Software Foundation, Inc. ++Copyright (C) 2008 Free Software Foundation, Inc. + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + exit $? +@@ -788,6 +794,7 @@ + *.for) xform=for ;; + *.java) xform=java ;; + *.obj) xform=obj ;; ++ *.sx) xform=sx ;; + esac + + libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` +@@ -956,7 +963,7 @@ + $run $rm "$lobj" "$output_obj" + + $show "$command" +- if $run eval "$command"; then : ++ if $run eval $lt_env "$command"; then : + else + test -n "$output_obj" && $run $rm $removelist + exit $EXIT_FAILURE +@@ -1028,7 +1035,7 @@ + command="$command$suppress_output" + $run $rm "$obj" "$output_obj" + $show "$command" +- if $run eval "$command"; then : ++ if $run eval $lt_env "$command"; then : + else + $run $rm $removelist + exit $EXIT_FAILURE +@@ -1161,6 +1168,7 @@ + thread_safe=no + vinfo= + vinfo_number=no ++ single_module="${wl}-single_module" + + func_infer_tag $base_compile + +@@ -1646,6 +1654,11 @@ + continue + ;; + ++ -multi_module) ++ single_module="${wl}-multi_module" ++ continue ++ ;; ++ + -module) + module=yes + continue +@@ -2152,7 +2165,12 @@ + continue + fi + name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` +- for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do ++ if test "$linkmode" = lib; then ++ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" ++ else ++ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" ++ fi ++ for searchdir in $searchdirs; do + for search_ext in .la $std_shrext .so .a; do + # Search the libtool library + lib="$searchdir/lib${name}${search_ext}" +@@ -2948,12 +2966,18 @@ + # we do not want to link against static libs, + # but need to link against shared + eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` ++ eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names" ; then + for tmp in $deplibrary_names ; do + depdepl=$tmp + done +- if test -f "$path/$depdepl" ; then ++ if test -f "$deplibdir/$depdepl" ; then ++ depdepl="$deplibdir/$depdepl" ++ elif test -f "$path/$depdepl" ; then + depdepl="$path/$depdepl" ++ else ++ # Can't find it, oh well... ++ depdepl= + fi + # do not add paths which are already there + case " $newlib_search_path " in +@@ -3101,9 +3125,10 @@ + + case $linkmode in + oldlib) +- if test -n "$deplibs"; then +- $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 +- fi ++ case " $deplibs" in ++ *\ -l* | *\ -L*) ++ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;; ++ esac + + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 +@@ -4245,9 +4270,10 @@ + ;; + + obj) +- if test -n "$deplibs"; then +- $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 +- fi ++ case " $deplibs" in ++ *\ -l* | *\ -L*) ++ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;; ++ esac + + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 +@@ -6486,7 +6512,7 @@ + fi + + # Restore saved environment variables +- for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES ++ for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES + do + eval "if test \"\${save_$lt_var+set}\" = set; then + $lt_var=\$save_$lt_var; export $lt_var +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/Makefile.in liboil-0.3.13/Makefile.in +--- liboil-0.3.13.old/Makefile.in 2008-02-22 21:56:03.000000000 +0100 ++++ liboil-0.3.13/Makefile.in 2008-02-26 12:34:00.000000000 +0100 +@@ -113,6 +113,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -182,6 +183,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/testsuite/instruction/Makefile.in liboil-0.3.13/testsuite/instruction/Makefile.in +--- liboil-0.3.13.old/testsuite/instruction/Makefile.in 2008-02-22 21:56:03.000000000 +0100 ++++ liboil-0.3.13/testsuite/instruction/Makefile.in 2008-02-26 12:33:59.000000000 +0100 +@@ -95,6 +95,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -164,6 +165,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -250,9 +252,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign testsuite/instruction/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu testsuite/instruction/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign testsuite/instruction/Makefile ++ $(AUTOMAKE) --gnu testsuite/instruction/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +diff -x'*config.sub' -x'*config.guess' -Naur liboil-0.3.13.old/testsuite/Makefile.in liboil-0.3.13/testsuite/Makefile.in +--- liboil-0.3.13.old/testsuite/Makefile.in 2008-02-22 21:56:03.000000000 +0100 ++++ liboil-0.3.13/testsuite/Makefile.in 2008-02-26 12:33:58.000000000 +0100 +@@ -171,6 +171,7 @@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -240,6 +241,7 @@ + MAKEINFO = @MAKEINFO@ + MMX_CFLAGS = @MMX_CFLAGS@ + NANO = @NANO@ ++NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ +@@ -329,9 +331,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign testsuite/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu testsuite/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign testsuite/Makefile ++ $(AUTOMAKE) --gnu testsuite/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ --- liboil-0.3.13.orig/debian/patches/06_alignment-bus-error.patch +++ liboil-0.3.13/debian/patches/06_alignment-bus-error.patch @@ -0,0 +1,13 @@ +--- liboil/ref/diffsquaresum_f32.c.old 2008-02-27 10:59:42.000000000 +0100 ++++ liboil/ref/diffsquaresum_f32.c 2008-02-27 11:00:34.000000000 +0100 +@@ -59,8 +59,8 @@ + int i; + + for(i=0;i on +Thu, 04 Nov 2004 18:17:18 -0800 + + +It was downloaded from http://liboil.freedesktop.org/download. + +Upstream Author: David Schleef + +Copyright: + + +The majority of the source code and the collective work is subject +to the following license: + + Copyright 2002,2003,2004,2005 David A. Schleef + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + + +The source code in the liboil/motovec directory is subject to the +following license: + + Copyright Motorola, Inc. 2003 + ALL RIGHTS RESERVED + + You are hereby granted a copyright license to use, modify, and + distribute the SOFTWARE so long as this entire notice is retained + without alteration in any modified and/or redistributed versions, + and that such modified versions are clearly identified as such. + No licenses are granted by implication, estoppel or otherwise under + any patents or trademarks of Motorola, Inc. + + The SOFTWARE is provided on an "AS IS" basis and without warranty. + To the maximum extent permitted by applicable law, MOTOROLA DISCLAIMS + ALL WARRANTIES WHETHER EXPRESS OR IMPLIED, INCLUDING IMPLIED + WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR + PURPOSE AND ANY WARRANTY AGAINST INFRINGEMENT WITH + REGARD TO THE SOFTWARE (INCLUDING ANY MODIFIED VERSIONS + THEREOF) AND ANY ACCOMPANYING WRITTEN MATERIALS. + + To the maximum extent permitted by applicable law, IN NO EVENT SHALL + MOTOROLA BE LIABLE FOR ANY DAMAGES WHATSOEVER + (INCLUDING WITHOUT LIMITATION, DAMAGES FOR LOSS OF + BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS + INFORMATION, OR OTHER PECUNIARY LOSS) ARISING OF THE USE OR + INABILITY TO USE THE SOFTWARE. Motorola assumes no responsibility + for the maintenance and support of the SOFTWARE. + + +The source code implementing the Mersenne Twister algorithm is +subject to the following license: + + Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura, + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + 3. The names of its contributors may not be used to endorse or promote + products derived from this software without specific prior written + permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + --- liboil-0.3.13.orig/debian/compat +++ liboil-0.3.13/debian/compat @@ -0,0 +1 @@ +6 --- liboil-0.3.13.orig/debian/liboil0.3.shlibs +++ liboil-0.3.13/debian/liboil0.3.shlibs @@ -0,0 +1 @@ +liboil-0.3 0 liboil0.3 (>= 0.3.13)