diff -Nru libmpc-0.1~r459/debian/changelog libmpc-0.1~r459/debian/changelog --- libmpc-0.1~r459/debian/changelog 2010-05-31 14:34:48.000000000 +0000 +++ libmpc-0.1~r459/debian/changelog 2010-12-12 01:09:16.000000000 +0000 @@ -1,3 +1,13 @@ +libmpc (2:0.1~r459-1ubuntu1) natty; urgency=low + + * debian/patches/04_link-order.patch: Link against -lm only after the + static libraries that use math functions. Fixes the build failure + from --as-needed, which enforces strict order. + * debian/patches/99_autoreconf.patch: Regenerate by autoconf -i and + removing the cache directory afterwards. + + -- Stefan Potyra Sun, 12 Dec 2010 02:07:30 +0100 + libmpc (2:0.1~r459-1) unstable; urgency=low * New upstream SVN snapshot. diff -Nru libmpc-0.1~r459/debian/control libmpc-0.1~r459/debian/control --- libmpc-0.1~r459/debian/control 2010-05-31 14:42:04.000000000 +0000 +++ libmpc-0.1~r459/debian/control 2010-12-12 01:10:08.000000000 +0000 @@ -1,7 +1,8 @@ Source: libmpc Section: sound Priority: optional -Maintainer: Debian multimedia packages maintainers +XSBC-Original-Maintainer: Debian multimedia packages maintainers +Maintainer: Ubuntu Developers Uploaders: Sebastian Dröge , Jorge Salamero Sanz Build-Depends: cdbs (>= 0.4.20), diff -Nru libmpc-0.1~r459/debian/patches/04_link-order.patch libmpc-0.1~r459/debian/patches/04_link-order.patch --- libmpc-0.1~r459/debian/patches/04_link-order.patch 1970-01-01 00:00:00.000000000 +0000 +++ libmpc-0.1~r459/debian/patches/04_link-order.patch 2010-12-12 01:06:43.000000000 +0000 @@ -0,0 +1,44 @@ +Index: libmpc-0.1~r459/mpc2sv8/Makefile.am +=================================================================== +--- libmpc-0.1~r459.orig/mpc2sv8/Makefile.am 2010-12-12 02:06:29.610851037 +0100 ++++ libmpc-0.1~r459/mpc2sv8/Makefile.am 2010-12-12 02:06:38.080851002 +0100 +@@ -11,6 +11,7 @@ + METASOURCES = AUTO + bin_PROGRAMS = mpc2sv8 + mpc2sv8_SOURCES = mpc2sv8.c $(common_sources) +-mpc2sv8_LDADD = -lm \ ++mpc2sv8_LDADD = \ + $(top_builddir)/libmpcdec/libmpcdec.la \ +- $(top_builddir)/libmpcenc/libmpcenc.a ++ $(top_builddir)/libmpcenc/libmpcenc.a \ ++ -lm +Index: libmpc-0.1~r459/mpcdec/Makefile.am +=================================================================== +--- libmpc-0.1~r459.orig/mpcdec/Makefile.am 2010-12-12 02:05:03.790851001 +0100 ++++ libmpc-0.1~r459/mpcdec/Makefile.am 2010-12-12 02:05:11.770851000 +0100 +@@ -9,6 +9,7 @@ + METASOURCES = AUTO + bin_PROGRAMS = mpcdec + mpcdec_SOURCES = mpcdec.c +-mpcdec_LDADD = -lm \ ++mpcdec_LDADD = \ + $(top_builddir)/libmpcdec/libmpcdec.la \ +- $(top_builddir)/libwavformat/libwavformat.a ++ $(top_builddir)/libwavformat/libwavformat.a \ ++ -lm +Index: libmpc-0.1~r459/mpcenc/Makefile.am +=================================================================== +--- libmpc-0.1~r459.orig/mpcenc/Makefile.am 2010-12-12 02:05:38.200851002 +0100 ++++ libmpc-0.1~r459/mpcenc/Makefile.am 2010-12-12 02:05:51.660851636 +0100 +@@ -22,8 +22,9 @@ + $(common_sources) \ + mpcenc.h predict.h config.h + +-mpcenc_LDADD = -lm \ ++mpcenc_LDADD = \ + $(EXTRALIBS) \ + $(top_builddir)/libmpcpsy/libmpcpsy.a \ +- $(top_builddir)/libmpcenc/libmpcenc.a ++ $(top_builddir)/libmpcenc/libmpcenc.a \ ++ -lm + diff -Nru libmpc-0.1~r459/debian/patches/99_autoreconf.patch libmpc-0.1~r459/debian/patches/99_autoreconf.patch --- libmpc-0.1~r459/debian/patches/99_autoreconf.patch 2010-05-31 14:33:01.000000000 +0000 +++ libmpc-0.1~r459/debian/patches/99_autoreconf.patch 2010-12-12 01:07:14.000000000 +0000 @@ -1,7 +1,7 @@ Index: libmpc-0.1~r459/Makefile.in =================================================================== ---- libmpc-0.1~r459.orig/Makefile.in 2010-05-31 16:32:58.650444930 +0200 -+++ libmpc-0.1~r459/Makefile.in 2010-05-31 16:32:54.198447262 +0200 +--- libmpc-0.1~r459.orig/Makefile.in 2010-12-12 02:02:44.080851002 +0100 ++++ libmpc-0.1~r459/Makefile.in 2010-12-12 02:06:46.810851002 +0100 @@ -139,12 +139,15 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ @@ -51,9 +51,17 @@ Index: libmpc-0.1~r459/aclocal.m4 =================================================================== ---- libmpc-0.1~r459.orig/aclocal.m4 2010-05-31 16:32:58.606447228 +0200 -+++ libmpc-0.1~r459/aclocal.m4 2010-05-31 16:32:51.167446185 +0200 -@@ -19,6 +19,164 @@ +--- libmpc-0.1~r459.orig/aclocal.m4 2010-12-12 02:02:44.280851002 +0100 ++++ libmpc-0.1~r459/aclocal.m4 2010-12-12 02:06:56.260851000 +0100 +@@ -13,12 +13,170 @@ + + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, +-[m4_warning([this file was generated for autoconf 2.65. ++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, ++[m4_warning([this file was generated for autoconf 2.67. + You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -194,7 +202,7 @@ +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + -+_PKG_TEXT])dnl ++_PKG_TEXT])[]dnl + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) @@ -205,7 +213,7 @@ + +_PKG_TEXT + -+To get pkg-config, see .])dnl ++To get pkg-config, see .])[]dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS @@ -267,8 +275,69 @@ # Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. Index: libmpc-0.1~r459/configure =================================================================== ---- libmpc-0.1~r459.orig/configure 2010-05-31 16:32:58.270445590 +0200 -+++ libmpc-0.1~r459/configure 2010-05-31 16:32:52.015444811 +0200 +--- libmpc-0.1~r459.orig/configure 2010-12-12 02:02:44.140851002 +0100 ++++ libmpc-0.1~r459/configure 2010-12-12 02:07:00.030851000 +0100 +@@ -1,11 +1,11 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.65 for libmpcs 0.1. ++# Generated by GNU Autoconf 2.67 for libmpcs 0.1. + # + # + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +-# Inc. ++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software ++# Foundation, Inc. + # + # + # This configure script is free software; the Free Software Foundation +@@ -316,7 +316,7 @@ + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" ++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + + } # as_fn_mkdir_p +@@ -356,19 +356,19 @@ + fi # as_fn_arith + + +-# as_fn_error ERROR [LINENO LOG_FD] +-# --------------------------------- ++# as_fn_error STATUS ERROR [LINENO LOG_FD] ++# ---------------------------------------- + # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are + # provided, also output the error to LOG_FD, referencing LINENO. Then exit the +-# script with status $?, using 1 if that was 0. ++# script with STATUS, using 1 if that was 0. + as_fn_error () + { +- as_status=$?; test $as_status -eq 0 && as_status=1 +- if test "$3"; then +- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 ++ as_status=$1; test $as_status -eq 0 && as_status=1 ++ if test "$4"; then ++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi +- $as_echo "$as_me: error: $1" >&2 ++ $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status + } # as_fn_error + +@@ -679,7 +679,7 @@ + exec 6>&1 + + # Name of the host. +-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, ++# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, + # so uname gets run too. + ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + @@ -748,6 +748,11 @@ HAVE_VISIBILITY_TRUE MPC_CHAP_FALSE @@ -313,7 +382,146 @@ # Initialize some variables set by options. -@@ -1498,6 +1512,8 @@ +@@ -941,8 +955,9 @@ + fi + + case $ac_option in +- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; +- *) ac_optarg=yes ;; ++ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; ++ *=) ac_optarg= ;; ++ *) ac_optarg=yes ;; + esac + + # Accept the important Cygnus configure options, so we can diagnose typos. +@@ -987,7 +1002,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error "invalid feature name: $ac_useropt" ++ as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1013,7 +1028,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error "invalid feature name: $ac_useropt" ++ as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1217,7 +1232,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error "invalid package name: $ac_useropt" ++ as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1233,7 +1248,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error "invalid package name: $ac_useropt" ++ as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1263,8 +1278,8 @@ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + +- -*) as_fn_error "unrecognized option: \`$ac_option' +-Try \`$0 --help' for more information." ++ -*) as_fn_error $? "unrecognized option: \`$ac_option' ++Try \`$0 --help' for more information" + ;; + + *=*) +@@ -1272,7 +1287,7 @@ + # Reject names that are not valid shell variable names. + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) +- as_fn_error "invalid variable name: \`$ac_envvar'" ;; ++ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; +@@ -1290,13 +1305,13 @@ + + if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` +- as_fn_error "missing argument to $ac_option" ++ as_fn_error $? "missing argument to $ac_option" + fi + + if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; +- fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; ++ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac + fi +@@ -1319,7 +1334,7 @@ + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac +- as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" ++ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" + done + + # There might be people who depend on the old broken behavior: `$host' +@@ -1333,8 +1348,8 @@ + if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe +- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. +- If a cross compiler is detected then cross compile mode will be used." >&2 ++ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. ++ If a cross compiler is detected then cross compile mode will be used" >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +@@ -1349,9 +1364,9 @@ + ac_pwd=`pwd` && test -n "$ac_pwd" && + ac_ls_di=`ls -di .` && + ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || +- as_fn_error "working directory cannot be determined" ++ as_fn_error $? "working directory cannot be determined" + test "X$ac_ls_di" = "X$ac_pwd_ls_di" || +- as_fn_error "pwd does not report name of working directory" ++ as_fn_error $? "pwd does not report name of working directory" + + + # Find the source files, if location was not specified. +@@ -1390,11 +1405,11 @@ + fi + if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." +- as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" ++ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" + fi + ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" + ac_abs_confdir=`( +- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" ++ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" + pwd)` + # When building in place, set srcdir=. + if test "$ac_abs_confdir" = "$ac_pwd"; then +@@ -1434,7 +1449,7 @@ + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit +- -q, --quiet, --silent do not print \`checking...' messages ++ -q, --quiet, --silent do not print \`checking ...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for \`--cache-file=config.cache' + -n, --no-create do not create output files +@@ -1498,6 +1513,8 @@ --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] @@ -322,7 +530,7 @@ --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --enable-shared[=PKGS] build shared libraries [default=yes] -@@ -1523,6 +1539,14 @@ +@@ -1523,6 +1540,14 @@ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor @@ -337,7 +545,268 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -@@ -2808,6 +2832,29 @@ +@@ -1591,9 +1616,9 @@ + if $ac_init_version; then + cat <<\_ACEOF + libmpcs configure 0.1 +-generated by GNU Autoconf 2.65 ++generated by GNU Autoconf 2.67 + +-Copyright (C) 2009 Free Software Foundation, Inc. ++Copyright (C) 2010 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + _ACEOF +@@ -1697,7 +1722,7 @@ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -1740,7 +1765,7 @@ + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } >/dev/null && { ++ test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : +@@ -1806,7 +1831,7 @@ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -1873,10 +1898,10 @@ + ac_fn_c_check_header_mongrel () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${$3+set}\"" = set; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + fi + eval ac_res=\$$3 +@@ -1912,7 +1937,7 @@ + else + ac_header_preproc=no + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 + $as_echo "$ac_header_preproc" >&6; } + +@@ -1939,7 +1964,7 @@ + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + eval "$3=\$ac_header_compiler" +@@ -1956,7 +1981,7 @@ + running configure, to aid debugging if configure makes a mistake. + + It was created by libmpcs $as_me 0.1, which was +-generated by GNU Autoconf 2.65. Invocation command line was ++generated by GNU Autoconf 2.67. Invocation command line was + + $ $0 $@ + +@@ -2066,11 +2091,9 @@ + { + echo + +- cat <<\_ASBOX +-## ---------------- ## ++ $as_echo "## ---------------- ## + ## Cache variables. ## +-## ---------------- ## +-_ASBOX ++## ---------------- ##" + echo + # The following way of writing the cache mishandles newlines in values, + ( +@@ -2104,11 +2127,9 @@ + ) + echo + +- cat <<\_ASBOX +-## ----------------- ## ++ $as_echo "## ----------------- ## + ## Output variables. ## +-## ----------------- ## +-_ASBOX ++## ----------------- ##" + echo + for ac_var in $ac_subst_vars + do +@@ -2121,11 +2142,9 @@ + echo + + if test -n "$ac_subst_files"; then +- cat <<\_ASBOX +-## ------------------- ## ++ $as_echo "## ------------------- ## + ## File substitutions. ## +-## ------------------- ## +-_ASBOX ++## ------------------- ##" + echo + for ac_var in $ac_subst_files + do +@@ -2139,11 +2158,9 @@ + fi + + if test -s confdefs.h; then +- cat <<\_ASBOX +-## ----------- ## ++ $as_echo "## ----------- ## + ## confdefs.h. ## +-## ----------- ## +-_ASBOX ++## ----------- ##" + echo + cat confdefs.h + echo +@@ -2198,7 +2215,12 @@ + ac_site_file1=NONE + ac_site_file2=NONE + if test -n "$CONFIG_SITE"; then +- ac_site_file1=$CONFIG_SITE ++ # We do not want a PATH search for config.site. ++ case $CONFIG_SITE in #(( ++ -*) ac_site_file1=./$CONFIG_SITE;; ++ */*) ac_site_file1=$CONFIG_SITE;; ++ *) ac_site_file1=./$CONFIG_SITE;; ++ esac + elif test "x$prefix" != xNONE; then + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site +@@ -2213,7 +2235,11 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 + $as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 +- . "$ac_site_file" ++ . "$ac_site_file" \ ++ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "failed to load site script $ac_site_file ++See \`config.log' for more details" "$LINENO" 5 ; } + fi + done + +@@ -2289,7 +2315,7 @@ + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 + $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} +- as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 ++ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + fi + ## -------------------- ## + ## Main body of script. ## +@@ -2304,16 +2330,22 @@ + + ac_aux_dir= + for ac_dir in config "$srcdir"/config; do +- for ac_t in install-sh install.sh shtool; do +- if test -f "$ac_dir/$ac_t"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/$ac_t -c" +- break 2 +- fi +- done ++ if test -f "$ac_dir/install-sh"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/install-sh -c" ++ break ++ elif test -f "$ac_dir/install.sh"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/install.sh -c" ++ break ++ elif test -f "$ac_dir/shtool"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/shtool install -c" ++ break ++ fi + done + if test -z "$ac_aux_dir"; then +- as_fn_error "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5 ++ as_fn_error $? "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5 + fi + + # These three variables are undocumented and unsupported, +@@ -2435,11 +2467,11 @@ + ' + case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) +- as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; ++ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; + esac + case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) +- as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; ++ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; + esac + + # Do `set' in a subshell so we don't clobber the current shell's +@@ -2461,7 +2493,7 @@ + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". +- as_fn_error "ls -t appears to fail. Make sure there is not a broken ++ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + +@@ -2471,7 +2503,7 @@ + # Ok. + : + else +- as_fn_error "newly created file is older than distributed files! ++ as_fn_error $? "newly created file is older than distributed files! + Check your system clock" "$LINENO" 5 + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +@@ -2709,7 +2741,7 @@ + $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } + set x ${MAKE-make} + ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + cat >conftest.make <<\_ACEOF +@@ -2717,7 +2749,7 @@ + all: + @echo '@@@%%%=$(MAKE)=@@@%%%' + _ACEOF +-# GNU make sometimes prints "make[1]: Entering...", which would confuse us. ++# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. + case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; +@@ -2751,7 +2783,7 @@ + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then +- as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 ++ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + fi + fi + +@@ -2808,6 +2840,29 @@ @@ -367,107 +836,321 @@ ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -4777,13 +4824,13 @@ +@@ -3114,8 +3169,8 @@ + + test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "no acceptable C compiler found in \$PATH +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "no acceptable C compiler found in \$PATH ++See \`config.log' for more details" "$LINENO" 5 ; } + + # Provide some information about the compiler. + $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +@@ -3229,9 +3284,8 @@ + + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "C compiler cannot create executables +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "C compiler cannot create executables ++See \`config.log' for more details" "$LINENO" 5 ; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +@@ -3273,8 +3327,8 @@ + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "cannot compute suffix of executables: cannot compile and link ++See \`config.log' for more details" "$LINENO" 5 ; } + fi + rm -f conftest conftest$ac_cv_exeext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +@@ -3331,9 +3385,9 @@ + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run C compiled programs. ++as_fn_error $? "cannot run C compiled programs. + If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." "$LINENO" 5; } ++See \`config.log' for more details" "$LINENO" 5 ; } + fi + fi + fi +@@ -3384,8 +3438,8 @@ + + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "cannot compute suffix of object files: cannot compile ++See \`config.log' for more details" "$LINENO" 5 ; } + fi + rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi +@@ -3796,7 +3850,7 @@ + + # Make sure we can run config.sub. + $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || +- as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 ++ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 + $as_echo_n "checking build system type... " >&6; } +@@ -3807,16 +3861,16 @@ + test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` + test "x$ac_build_alias" = x && +- as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 ++ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 + ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || +- as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 ++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 + $as_echo "$ac_cv_build" >&6; } + case $ac_cv_build in + *-*-*) ;; +-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; ++*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; + esac + build=$ac_cv_build + ac_save_IFS=$IFS; IFS='-' +@@ -3841,7 +3895,7 @@ + ac_cv_host=$ac_cv_build + else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || +- as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 ++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + fi + + fi +@@ -3849,7 +3903,7 @@ + $as_echo "$ac_cv_host" >&6; } + case $ac_cv_host in + *-*-*) ;; +-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; ++*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; + esac + host=$ac_cv_host + ac_save_IFS=$IFS; IFS='-' +@@ -4250,7 +4304,7 @@ + done + IFS=$as_save_IFS + if test -z "$ac_cv_path_SED"; then +- as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 ++ as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi + else + ac_cv_path_SED=$SED +@@ -4326,7 +4380,7 @@ + done + IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then +- as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_GREP=$GREP +@@ -4392,7 +4446,7 @@ + done + IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then +- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_EGREP=$EGREP +@@ -4459,7 +4513,7 @@ + done + IFS=$as_save_IFS + if test -z "$ac_cv_path_FGREP"; then +- as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_FGREP=$FGREP +@@ -4575,7 +4629,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi +-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 ++test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 + $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } + if test "${lt_cv_prog_gnu_ld+set}" = set; then : +@@ -4777,13 +4831,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4780: $ac_compile\"" >&5) -+ (eval echo "\"\$as_me:4827: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:4834: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4783: $NM \\\"conftest.$ac_objext\\\"\"" >&5) -+ (eval echo "\"\$as_me:4830: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:4837: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4786: output\"" >&5) -+ (eval echo "\"\$as_me:4833: output\"" >&5) ++ (eval echo "\"\$as_me:4840: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" -@@ -5986,7 +6033,7 @@ +@@ -5986,7 +6040,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5989 "configure"' > conftest.$ac_ext -+ echo '#line 6036 "configure"' > conftest.$ac_ext ++ echo '#line 6043 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? -@@ -7514,11 +7561,11 @@ +@@ -6775,7 +6829,7 @@ + # Broken: fails on valid input. + continue + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +@@ -6791,11 +6845,11 @@ + ac_preproc_ok=: + break + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.i conftest.err conftest.$ac_ext + if $ac_preproc_ok; then : + break + fi +@@ -6834,7 +6888,7 @@ + # Broken: fails on valid input. + continue + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +@@ -6850,18 +6904,18 @@ + ac_preproc_ok=: + break + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.i conftest.err conftest.$ac_ext + if $ac_preproc_ok; then : + + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details" "$LINENO" 5 ; } + fi + + ac_ext=c +@@ -6990,8 +7044,7 @@ + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default + " +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -7514,11 +7567,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:7517: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:7564: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7570: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7521: \$? = $ac_status" >&5 -+ echo "$as_me:7568: \$? = $ac_status" >&5 ++ echo "$as_me:7574: \$? = $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. -@@ -7853,11 +7900,11 @@ +@@ -7853,11 +7906,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:7856: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:7903: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7909: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7860: \$? = $ac_status" >&5 -+ echo "$as_me:7907: \$? = $ac_status" >&5 ++ echo "$as_me:7913: \$? = $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. -@@ -7958,11 +8005,11 @@ +@@ -7958,11 +8011,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:7961: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8008: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8014: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7965: \$? = $ac_status" >&5 -+ echo "$as_me:8012: \$? = $ac_status" >&5 ++ echo "$as_me:8018: \$? = $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 -@@ -8013,11 +8060,11 @@ +@@ -8013,11 +8066,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:8016: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8063: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8069: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8020: \$? = $ac_status" >&5 -+ echo "$as_me:8067: \$? = $ac_status" >&5 ++ echo "$as_me:8073: \$? = $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 -@@ -10397,7 +10444,7 @@ +@@ -10397,7 +10450,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10400 "configure" -+#line 10447 "configure" ++#line 10453 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -10493,7 +10540,7 @@ +@@ -10493,7 +10546,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10496 "configure" -+#line 10543 "configure" ++#line 10549 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -10760,6 +10807,219 @@ +@@ -10760,6 +10813,219 @@ enableval=$enable_mpcchap; fi @@ -648,7 +1331,7 @@ + # Put the nasty error message in config.log where it belongs + echo "$LIBCUE_PKG_ERRORS" >&5 + -+ as_fn_error "Package requirements (libcue) were not met: ++ as_fn_error $? "Package requirements (libcue) were not met: + +$LIBCUE_PKG_ERRORS + @@ -663,7 +1346,7 @@ +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error "The pkg-config script could not be found or is too old. Make sure it ++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + @@ -672,7 +1355,7 @@ +See the pkg-config man page for more details. + +To get pkg-config, see . -+See \`config.log' for more details." "$LINENO" 5; } ++See \`config.log' for more details" "$LINENO" 5 ; } +else + LIBCUE_CFLAGS=$pkg_cv_LIBCUE_CFLAGS + LIBCUE_LIBS=$pkg_cv_LIBCUE_LIBS @@ -687,21 +1370,355 @@ if test "x$enable_mpcchap" = xyes; then MPC_CHAP_TRUE= MPC_CHAP_FALSE='#' -@@ -10887,6 +11147,10 @@ +@@ -10865,6 +11131,7 @@ + + ac_libobjs= + ac_ltlibobjs= ++U= + for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' +@@ -10887,24 +11154,28 @@ am__EXEEXT_FALSE= fi +if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then -+ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. ++ as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - as_fn_error "conditional \"AMDEP\" was never defined. +- as_fn_error "conditional \"AMDEP\" was never defined. ++ as_fn_error $? "conditional \"AMDEP\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then +- as_fn_error "conditional \"am__fastdepCC\" was never defined. ++ as_fn_error $? "conditional \"am__fastdepCC\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${MPC_GAIN_TRUE}" && test -z "${MPC_GAIN_FALSE}"; then +- as_fn_error "conditional \"MPC_GAIN\" was never defined. ++ as_fn_error $? "conditional \"MPC_GAIN\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${MPC_CHAP_TRUE}" && test -z "${MPC_CHAP_FALSE}"; then +- as_fn_error "conditional \"MPC_CHAP\" was never defined. ++ as_fn_error $? "conditional \"MPC_CHAP\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_VISIBILITY_TRUE}" && test -z "${HAVE_VISIBILITY_FALSE}"; then +- as_fn_error "conditional \"HAVE_VISIBILITY\" was never defined. ++ as_fn_error $? "conditional \"HAVE_VISIBILITY\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + +@@ -11054,19 +11325,19 @@ + (unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +-# as_fn_error ERROR [LINENO LOG_FD] +-# --------------------------------- ++# as_fn_error STATUS ERROR [LINENO LOG_FD] ++# ---------------------------------------- + # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are + # provided, also output the error to LOG_FD, referencing LINENO. Then exit the +-# script with status $?, using 1 if that was 0. ++# script with STATUS, using 1 if that was 0. + as_fn_error () + { +- as_status=$?; test $as_status -eq 0 && as_status=1 +- if test "$3"; then +- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 ++ as_status=$1; test $as_status -eq 0 && as_status=1 ++ if test "$4"; then ++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi +- $as_echo "$as_me: error: $1" >&2 ++ $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status + } # as_fn_error + +@@ -11262,7 +11533,7 @@ + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" ++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + + } # as_fn_mkdir_p +@@ -11316,7 +11587,7 @@ + # values after options handling. + ac_log=" + This file was extended by libmpcs $as_me 0.1, which was +-generated by GNU Autoconf 2.65. Invocation command line was ++generated by GNU Autoconf 2.67. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -11382,10 +11653,10 @@ + ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ + libmpcs config.status 0.1 +-configured by $0, generated by GNU Autoconf 2.65, ++configured by $0, generated by GNU Autoconf 2.67, + with options \\"\$ac_cs_config\\" + +-Copyright (C) 2009 Free Software Foundation, Inc. ++Copyright (C) 2010 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." + +@@ -11403,11 +11674,16 @@ + while test $# != 0 + do + case $1 in +- --*=*) ++ --*=?*) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; ++ --*=) ++ ac_option=`expr "X$1" : 'X\([^=]*\)='` ++ ac_optarg= ++ ac_shift=: ++ ;; + *) + ac_option=$1 + ac_optarg=$2 +@@ -11429,6 +11705,7 @@ + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ '') as_fn_error $? "missing file argument" ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" + ac_need_defaults=false;; +@@ -11441,7 +11718,7 @@ + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header +- as_fn_error "ambiguous option: \`$1' ++ as_fn_error $? "ambiguous option: \`$1' + Try \`$0 --help' for more information.";; + --help | --hel | -h ) + $as_echo "$ac_cs_usage"; exit ;; +@@ -11450,7 +11727,7 @@ + ac_cs_silent=: ;; + + # This is an error. +- -*) as_fn_error "unrecognized option: \`$1' ++ -*) as_fn_error $? "unrecognized option: \`$1' + Try \`$0 --help' for more information." ;; + + *) as_fn_append ac_config_targets " $1" +@@ -11777,7 +12054,7 @@ + "mpcgain/Makefile") CONFIG_FILES="$CONFIG_FILES mpcgain/Makefile" ;; + "wavcmp/Makefile") CONFIG_FILES="$CONFIG_FILES wavcmp/Makefile" ;; + +- *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; ++ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; + esac + done + +@@ -11815,7 +12092,7 @@ + { + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 ++} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 + + # Set up the scripts for CONFIG_FILES section. + # No need to generate them if there are no CONFIG_FILES. +@@ -11832,7 +12109,7 @@ + fi + ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` + if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then +- ac_cs_awk_cr='\r' ++ ac_cs_awk_cr='\\r' + else + ac_cs_awk_cr=$ac_cr + fi +@@ -11846,18 +12123,18 @@ + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" + } >conf$$subs.sh || +- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 +-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ++ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + . ./conf$$subs.sh || +- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then + break + elif $ac_last_try; then +- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +@@ -11946,20 +12223,28 @@ + else + cat + fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ +- || as_fn_error "could not setup config files machinery" "$LINENO" 5 ++ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 + _ACEOF + +-# VPATH may cause trouble with some makes, so we remove $(srcdir), +-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and ++# VPATH may cause trouble with some makes, so we remove sole $(srcdir), ++# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and + # trailing colons and then remove the whole line if VPATH becomes empty + # (actually we leave an empty line to preserve line numbers). + if test "x$srcdir" = x.; then +- ac_vpsub='/^[ ]*VPATH[ ]*=/{ +-s/:*\$(srcdir):*/:/ +-s/:*\${srcdir}:*/:/ +-s/:*@srcdir@:*/:/ +-s/^\([^=]*=[ ]*\):*/\1/ ++ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ ++h ++s/// ++s/^/:/ ++s/[ ]*$/:/ ++s/:\$(srcdir):/:/g ++s/:\${srcdir}:/:/g ++s/:@srcdir@:/:/g ++s/^:*// + s/:*$// ++x ++s/\(=[ ]*\).*/\1/ ++G ++s/\n// + s/^[^=]*=[ ]*$// + }' + fi +@@ -11987,7 +12272,7 @@ + if test -z "$ac_t"; then + break + elif $ac_last_try; then +- as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 ++ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +@@ -12072,7 +12357,7 @@ + _ACAWK + _ACEOF + cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +- as_fn_error "could not setup config headers machinery" "$LINENO" 5 ++ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 + fi # test -n "$CONFIG_HEADERS" + + +@@ -12085,7 +12370,7 @@ + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; +- :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; ++ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac +@@ -12113,7 +12398,7 @@ + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || +- as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; ++ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; + esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append ac_file_inputs " '$ac_f'" +@@ -12140,7 +12425,7 @@ + + case $ac_tag in + *:-:* | *:-) cat >"$tmp/stdin" \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac +@@ -12277,22 +12562,22 @@ + $ac_datarootdir_hack + " + eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + + test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +-which seems to be undefined. Please make sure it is defined." >&5 ++which seems to be undefined. Please make sure it is defined" >&5 + $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +-which seems to be undefined. Please make sure it is defined." >&2;} ++which seems to be undefined. Please make sure it is defined" >&2;} + + rm -f "$tmp/stdin" + case $ac_file in + -) cat "$tmp/out" && rm -f "$tmp/out";; + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + esac \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + ;; + :H) + # +@@ -12303,19 +12588,19 @@ + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" + } >"$tmp/config.h" \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 + $as_echo "$as_me: $ac_file is unchanged" >&6;} + else + rm -f "$ac_file" + mv "$tmp/config.h" "$ac_file" \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + fi + else + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ +- || as_fn_error "could not create -" "$LINENO" 5 ++ || as_fn_error $? "could not create -" "$LINENO" 5 + fi + # Compute "$ac_file"'s index in $config_headers. + _am_arg="$ac_file" +@@ -13106,7 +13391,7 @@ + ac_clean_files=$ac_clean_files_save + + test $ac_write_fail = 0 || +- as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 ++ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + + + # configure is writing to config.log, and then calls config.status. +@@ -13127,7 +13412,7 @@ + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. +- $ac_cs_success || as_fn_exit $? ++ $ac_cs_success || as_fn_exit 1 + fi + if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 Index: libmpc-0.1~r459/include/Makefile.in =================================================================== ---- libmpc-0.1~r459.orig/include/Makefile.in 2010-05-31 16:32:58.366456331 +0200 -+++ libmpc-0.1~r459/include/Makefile.in 2010-05-31 16:32:53.242445454 +0200 +--- libmpc-0.1~r459.orig/include/Makefile.in 2010-12-12 02:02:44.000851002 +0100 ++++ libmpc-0.1~r459/include/Makefile.in 2010-12-12 02:06:46.820851002 +0100 @@ -110,12 +110,15 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ @@ -760,8 +1777,8 @@ touch $@ Index: libmpc-0.1~r459/libmpcdec/Makefile.in =================================================================== ---- libmpc-0.1~r459.orig/libmpcdec/Makefile.in 2010-05-31 16:32:58.510449971 +0200 -+++ libmpc-0.1~r459/libmpcdec/Makefile.in 2010-05-31 16:32:53.322446829 +0200 +--- libmpc-0.1~r459.orig/libmpcdec/Makefile.in 2010-12-12 02:02:44.070851002 +0100 ++++ libmpc-0.1~r459/libmpcdec/Makefile.in 2010-12-12 02:06:46.820851002 +0100 @@ -71,7 +71,7 @@ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(libdir)" @@ -825,8 +1842,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) Index: libmpc-0.1~r459/libmpcenc/Makefile.in =================================================================== ---- libmpc-0.1~r459.orig/libmpcenc/Makefile.in 2010-05-31 16:32:58.422452762 +0200 -+++ libmpc-0.1~r459/libmpcenc/Makefile.in 2010-05-31 16:32:53.398446224 +0200 +--- libmpc-0.1~r459.orig/libmpcenc/Makefile.in 2010-12-12 02:02:44.050851002 +0100 ++++ libmpc-0.1~r459/libmpcenc/Makefile.in 2010-12-12 02:06:46.820851002 +0100 @@ -106,12 +106,15 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ @@ -876,8 +1893,8 @@ Index: libmpc-0.1~r459/libmpcpsy/Makefile.in =================================================================== ---- libmpc-0.1~r459.orig/libmpcpsy/Makefile.in 2010-05-31 16:32:58.019445731 +0200 -+++ libmpc-0.1~r459/libmpcpsy/Makefile.in 2010-05-31 16:32:53.474447217 +0200 +--- libmpc-0.1~r459.orig/libmpcpsy/Makefile.in 2010-12-12 02:02:44.100851002 +0100 ++++ libmpc-0.1~r459/libmpcpsy/Makefile.in 2010-12-12 02:06:46.820851002 +0100 @@ -107,12 +107,15 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ @@ -927,8 +1944,8 @@ Index: libmpc-0.1~r459/libwavformat/Makefile.in =================================================================== ---- libmpc-0.1~r459.orig/libwavformat/Makefile.in 2010-05-31 16:32:58.766445643 +0200 -+++ libmpc-0.1~r459/libwavformat/Makefile.in 2010-05-31 16:32:53.542446218 +0200 +--- libmpc-0.1~r459.orig/libwavformat/Makefile.in 2010-12-12 02:02:44.210851002 +0100 ++++ libmpc-0.1~r459/libwavformat/Makefile.in 2010-12-12 02:06:46.820851002 +0100 @@ -105,12 +105,15 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ @@ -978,8 +1995,8 @@ Index: libmpc-0.1~r459/mpc2sv8/Makefile.in =================================================================== ---- libmpc-0.1~r459.orig/mpc2sv8/Makefile.in 2010-05-31 16:32:58.810447957 +0200 -+++ libmpc-0.1~r459/mpc2sv8/Makefile.in 2010-05-31 16:32:53.614444546 +0200 +--- libmpc-0.1~r459.orig/mpc2sv8/Makefile.in 2010-12-12 02:02:44.300851002 +0100 ++++ libmpc-0.1~r459/mpc2sv8/Makefile.in 2010-12-12 02:07:01.210851000 +0100 @@ -107,12 +107,15 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ @@ -1006,7 +2023,18 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ -@@ -201,7 +207,7 @@ +@@ -193,15 +199,16 @@ + common_sources = ../common/crc32.c + METASOURCES = AUTO + mpc2sv8_SOURCES = mpc2sv8.c $(common_sources) +-mpc2sv8_LDADD = -lm \ ++mpc2sv8_LDADD = \ + $(top_builddir)/libmpcdec/libmpcdec.la \ +- $(top_builddir)/libmpcenc/libmpcenc.a ++ $(top_builddir)/libmpcenc/libmpcenc.a \ ++ -lm + + all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj @@ -1015,7 +2043,7 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ -@@ -226,9 +232,9 @@ +@@ -226,9 +233,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1029,8 +2057,8 @@ install-binPROGRAMS: $(bin_PROGRAMS) Index: libmpc-0.1~r459/mpcchap/Makefile.in =================================================================== ---- libmpc-0.1~r459.orig/mpcchap/Makefile.in 2010-05-31 16:32:58.310448164 +0200 -+++ libmpc-0.1~r459/mpcchap/Makefile.in 2010-05-31 16:32:53.706445417 +0200 +--- libmpc-0.1~r459.orig/mpcchap/Makefile.in 2010-12-12 02:02:44.260851002 +0100 ++++ libmpc-0.1~r459/mpcchap/Makefile.in 2010-12-12 02:06:46.820851002 +0100 @@ -54,8 +54,9 @@ am_mpcchap_OBJECTS = dictionary.$(OBJEXT) iniparser.$(OBJEXT) \ mpcchap.$(OBJEXT) $(am__objects_1) @@ -1109,8 +2137,8 @@ install-binPROGRAMS: $(bin_PROGRAMS) Index: libmpc-0.1~r459/mpccut/Makefile.in =================================================================== ---- libmpc-0.1~r459.orig/mpccut/Makefile.in 2010-05-31 16:32:58.546445537 +0200 -+++ libmpc-0.1~r459/mpccut/Makefile.in 2010-05-31 16:32:53.774444707 +0200 +--- libmpc-0.1~r459.orig/mpccut/Makefile.in 2010-12-12 02:02:44.130851002 +0100 ++++ libmpc-0.1~r459/mpccut/Makefile.in 2010-12-12 02:06:46.820851002 +0100 @@ -107,12 +107,15 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ @@ -1160,8 +2188,8 @@ install-binPROGRAMS: $(bin_PROGRAMS) Index: libmpc-0.1~r459/mpcdec/Makefile.in =================================================================== ---- libmpc-0.1~r459.orig/mpcdec/Makefile.in 2010-05-31 16:32:58.686444968 +0200 -+++ libmpc-0.1~r459/mpcdec/Makefile.in 2010-05-31 16:32:53.850445780 +0200 +--- libmpc-0.1~r459.orig/mpcdec/Makefile.in 2010-12-12 02:02:44.160851002 +0100 ++++ libmpc-0.1~r459/mpcdec/Makefile.in 2010-12-12 02:07:01.360851000 +0100 @@ -106,12 +106,15 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ @@ -1188,7 +2216,18 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ -@@ -199,7 +205,7 @@ +@@ -191,15 +197,16 @@ + @HAVE_VISIBILITY_TRUE@AM_CFLAGS = -fvisibility=hidden + METASOURCES = AUTO + mpcdec_SOURCES = mpcdec.c +-mpcdec_LDADD = -lm \ ++mpcdec_LDADD = \ + $(top_builddir)/libmpcdec/libmpcdec.la \ +- $(top_builddir)/libwavformat/libwavformat.a ++ $(top_builddir)/libwavformat/libwavformat.a \ ++ -lm + + all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj @@ -1197,7 +2236,7 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ -@@ -224,9 +230,9 @@ +@@ -224,9 +231,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1211,8 +2250,8 @@ install-binPROGRAMS: $(bin_PROGRAMS) Index: libmpc-0.1~r459/mpcenc/Makefile.in =================================================================== ---- libmpc-0.1~r459.orig/mpcenc/Makefile.in 2010-05-31 16:32:58.143445851 +0200 -+++ libmpc-0.1~r459/mpcenc/Makefile.in 2010-05-31 16:32:53.974447009 +0200 +--- libmpc-0.1~r459.orig/mpcenc/Makefile.in 2010-12-12 02:02:44.240851002 +0100 ++++ libmpc-0.1~r459/mpcenc/Makefile.in 2010-12-12 02:07:01.430851000 +0100 @@ -115,12 +115,15 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ @@ -1239,7 +2278,19 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ -@@ -224,7 +230,7 @@ +@@ -215,16 +221,17 @@ + $(common_sources) \ + mpcenc.h predict.h config.h + +-mpcenc_LDADD = -lm \ ++mpcenc_LDADD = \ + $(EXTRALIBS) \ + $(top_builddir)/libmpcpsy/libmpcpsy.a \ +- $(top_builddir)/libmpcenc/libmpcenc.a ++ $(top_builddir)/libmpcenc/libmpcenc.a \ ++ -lm + + all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj @@ -1248,7 +2299,7 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ -@@ -249,9 +255,9 @@ +@@ -249,9 +256,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1262,8 +2313,8 @@ install-binPROGRAMS: $(bin_PROGRAMS) Index: libmpc-0.1~r459/mpcgain/Makefile.in =================================================================== ---- libmpc-0.1~r459.orig/mpcgain/Makefile.in 2010-05-31 16:32:58.179446308 +0200 -+++ libmpc-0.1~r459/mpcgain/Makefile.in 2010-05-31 16:32:54.058445037 +0200 +--- libmpc-0.1~r459.orig/mpcgain/Makefile.in 2010-12-12 02:02:44.020851002 +0100 ++++ libmpc-0.1~r459/mpcgain/Makefile.in 2010-12-12 02:06:46.820851002 +0100 @@ -106,12 +106,15 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ @@ -1313,8 +2364,8 @@ install-binPROGRAMS: $(bin_PROGRAMS) Index: libmpc-0.1~r459/wavcmp/Makefile.in =================================================================== ---- libmpc-0.1~r459.orig/wavcmp/Makefile.in 2010-05-31 16:32:58.083447999 +0200 -+++ libmpc-0.1~r459/wavcmp/Makefile.in 2010-05-31 16:32:54.146444772 +0200 +--- libmpc-0.1~r459.orig/wavcmp/Makefile.in 2010-12-12 02:02:44.190851002 +0100 ++++ libmpc-0.1~r459/wavcmp/Makefile.in 2010-12-12 02:06:46.820851002 +0100 @@ -105,12 +105,15 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ diff -Nru libmpc-0.1~r459/debian/patches/series libmpc-0.1~r459/debian/patches/series --- libmpc-0.1~r459/debian/patches/series 2010-05-31 14:32:38.000000000 +0000 +++ libmpc-0.1~r459/debian/patches/series 2010-12-12 01:04:54.000000000 +0000 @@ -1,4 +1,5 @@ 01_am-maintainer-mode.patch 02_link-libm.patch 03_mpcchap.patch +04_link-order.patch 99_autoreconf.patch