configure - Issue 2345493002: Uprev libmtp to 1.1.12

Unified Diff: configure

Issue 2345493002: Uprev libmtp to 1.1.12 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libmtp@master

Patch Set: Re-upload cl Created 4 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: configure

diff --git a/configure b/configure

index afd225b477b5bf5030ee7102cda8829ba08757c4..f555122875bcc2ead91f917cd947db50ca3e8b3c 100755

--- a/configure

+++ b/configure

@@ -1,13 +1,11 @@

#! /bin/sh

# Guess values for system-dependent variables and create Makefiles.

-# Generated by GNU Autoconf 2.68 for libmtp 1.1.5.

+# Generated by GNU Autoconf 2.69 for libmtp 1.1.12.

# Report bugs to <libmtp-discuss@lists.sourceforge.net>.

-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software

-# Foundation, Inc.

# This configure script is free software; the Free Software Foundation

@@ -136,6 +134,31 @@ export LANGUAGE

# CDPATH.

(unset CDPATH) >/dev/null 2>&1 && unset CDPATH

+# Use a proper internal environment variable to ensure we don't fall

+ # into an infinite loop, continuously re-executing ourselves.

+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then

+ _as_can_reexec=no; export _as_can_reexec;

+ # We cannot yet assume a decent shell, so we have to provide a

+# neutralization value for shells without unset; and this also

+# works around shells that cannot unset nonexistent variables.

+# Preserve -v and -x to the replacement shell.

+BASH_ENV=/dev/null

+ENV=/dev/null

+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV

+case $- in # ((((

+ *v*x* | *x*v* ) as_opts=-vx ;;

+ *v* ) as_opts=-v ;;

+ *x* ) as_opts=-x ;;

+ * ) as_opts= ;;

+esac

+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}

+# Admittedly, this is quite paranoid, since all the known shells bail

+# out after a failed `exec'.

+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2

+as_fn_exit 255

+ fi

+ # We don't want this to propagate to other subprocesses.

+ { _as_can_reexec=; unset _as_can_reexec;}

if test "x$CONFIG_SHELL" = x; then

as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :

emulate sh

@@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :

else

exitcode=1; echo positional parameters were not saved.

-test x\$exitcode = x0 || exit 1"

+test x\$exitcode = x0 || exit 1

+test -x / || exit 1"

as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO

as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO

eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&

@@ -222,21 +246,25 @@ IFS=$as_save_IFS

if test "x$CONFIG_SHELL" != x; then :

- # We cannot yet assume a decent shell, so we have to provide a

- # neutralization value for shells without unset; and this also

- # works around shells that cannot unset nonexistent variables.

- # Preserve -v and -x to the replacement shell.

- BASH_ENV=/dev/null

- ENV=/dev/null

- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV

- export CONFIG_SHELL

- case $- in # ((((

- *v*x* | *x*v* ) as_opts=-vx ;;

- *v* ) as_opts=-v ;;

- *x* ) as_opts=-x ;;

- * ) as_opts= ;;

- esac

- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}

+ export CONFIG_SHELL

+ # We cannot yet assume a decent shell, so we have to provide a

+# neutralization value for shells without unset; and this also

+# works around shells that cannot unset nonexistent variables.

+# Preserve -v and -x to the replacement shell.

+BASH_ENV=/dev/null

+ENV=/dev/null

+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV

+case $- in # ((((

+ *v*x* | *x*v* ) as_opts=-vx ;;

+ *v* ) as_opts=-v ;;

+ *x* ) as_opts=-x ;;

+ * ) as_opts= ;;

+esac

+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}

+# Admittedly, this is quite paranoid, since all the known shells bail

+# out after a failed `exec'.

+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2

+exit 255

if test x$as_have_required = xno; then :

@@ -339,6 +367,14 @@ $as_echo X"$as_dir" |

} # as_fn_mkdir_p

+# as_fn_executable_p FILE

+# -----------------------

+# Test if FILE is an executable regular file.

+as_fn_executable_p ()

+ test -f "$1" && test -x "$1"

+} # as_fn_executable_p

# as_fn_append VAR VALUE

# ----------------------

# Append the text in VALUE to the end of the definition contained in VAR. Take

@@ -460,6 +496,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits

chmod +x "$as_me.lineno" ||

{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }

+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have

+ # already done that, so ensure we don't try to do so again and fall

+ # in an infinite loop. This has already happened in practice.

+ _as_can_reexec=no; export _as_can_reexec

# Don't try to exec as it changes $[0], causing all sort of problems

# (the dirname of $[0] is not the place where we might find the

# original and so on. Autoconf is especially sensitive to this).

@@ -494,16 +534,16 @@ if (echo >conf$$.file) 2>/dev/null; then

# ... but there are two gotchas:

# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.

# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.

- # In both cases, we have to default to `cp -p'.

+ # In both cases, we have to default to `cp -pR'.

ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||

- as_ln_s='cp -p'

+ as_ln_s='cp -pR'

elif ln conf$$.file conf$$ 2>/dev/null; then

as_ln_s=ln

else

- as_ln_s='cp -p'

+ as_ln_s='cp -pR'

else

- as_ln_s='cp -p'

+ as_ln_s='cp -pR'

rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file

rmdir conf$$.dir 2>/dev/null

@@ -515,28 +555,8 @@ else

as_mkdir_p=false

-if test -x / >/dev/null 2>&1; then

- as_test_x='test -x'

-else

- if ls -dL / >/dev/null 2>&1; then

- as_ls_L_option=L

- else

- as_ls_L_option=

- fi

- as_test_x='

- eval sh -c '\''

- if test -d "$1"; then

- test -d "$1/.";

- else

- case $1 in #(

- -*)set "./$1";;

- esac;

- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((

- ???[sx]*):;;*)false;;esac;fi

- '\'' sh

- '

-fi

-as_executable_p=$as_test_x

+as_test_x='test -x'

+as_executable_p=as_fn_executable_p

# Sed expression to map a string onto a valid CPP name.

as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"

@@ -570,8 +590,8 @@ MAKEFLAGS=

# Identity of this package.

PACKAGE_NAME='libmtp'

PACKAGE_TARNAME='libmtp'

-PACKAGE_VERSION='1.1.5'

-PACKAGE_STRING='libmtp 1.1.5'

+PACKAGE_VERSION='1.1.12'

+PACKAGE_STRING='libmtp 1.1.12'

PACKAGE_BUGREPORT='libmtp-discuss@lists.sourceforge.net'

PACKAGE_URL=''

@@ -696,6 +716,10 @@ CPPFLAGS

LDFLAGS

CFLAGS

+AM_BACKSLASH

+AM_DEFAULT_VERBOSITY

+AM_DEFAULT_V

+AM_V

am__untar

am__tar

AMTAR

@@ -760,6 +784,7 @@ SHELL'

ac_subst_files=''

ac_user_opts='

enable_option_checking

+enable_silent_rules

enable_dependency_tracking

enable_shared

enable_static

@@ -1247,8 +1272,6 @@ target=$target_alias

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

elif test "x$build_alias" != "x$host_alias"; then

cross_compiling=yes

@@ -1334,7 +1357,7 @@ if test "$ac_init_help" = "long"; then

# Omit some internal or obsolete options to make the list less imposing.

# This message is too long to be a string in the A/UX 3.1 sh.

cat <<_ACEOF

-\`configure' configures libmtp 1.1.5 to adapt to many kinds of systems.

+\`configure' configures libmtp 1.1.12 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -1404,7 +1427,7 @@ fi

if test -n "$ac_init_help"; then

case $ac_init_help in

- short | recursive ) echo "Configuration of libmtp 1.1.5:";;

+ short | recursive ) echo "Configuration of libmtp 1.1.12:";;

esac

cat <<\_ACEOF

@@ -1412,15 +1435,19 @@ Optional Features:

--disable-option-checking ignore unrecognized --enable/--with options

--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)

--enable-FEATURE[=ARG] include FEATURE [ARG=yes]

- --disable-dependency-tracking speeds up one-time build

- --enable-dependency-tracking do not reject slow dependency extractors

+ --enable-silent-rules less verbose build output (undo: "make V=1")

+ --disable-silent-rules verbose build output (undo: "make V=0")

+ --enable-dependency-tracking

+ do not reject slow dependency extractors

+ --disable-dependency-tracking

+ speeds up one-time build

--enable-shared[=PKGS] build shared libraries [default=yes]

--enable-static[=PKGS] build static libraries [default=yes]

--enable-fast-install[=PKGS]

optimize for fast installation [default=yes]

--disable-libtool-lock avoid locking (might break parallel builds)

--disable-rpath do not hardcode runtime library paths

- --enable-doxygen Build API documentation using Doxygen [default=no]

+ --enable-doxygen Build API documentation using Doxygen [default=auto]

--disable-mtpz Disable functionality to connect to MTPZ devices

(e.g. Zune)

--disable-largefile omit support for large files

@@ -1433,11 +1460,11 @@ Optional Packages:

--with-gnu-ld assume the C compiler uses GNU ld [default=no]

--with-sysroot=DIR Search for dependent libraries within DIR

(or the compiler's sysroot if not specified).

- --with-gnu-ld assume the C compiler uses GNU ld default=no

+ --with-gnu-ld assume the C compiler uses GNU ld [default=no]

--with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib

--without-libiconv-prefix don't search for libiconv in includedir and libdir

--with-udev=DIR directory where udev is installed

- [default=/lib/udev]

+ [default=/usr/lib/udev]

--with-udev-rules=NAME file name for udev rules [default=69-libmtp.rules]

--with-udev-group=GROUP file group for device nodes [default: none

specified]

@@ -1527,10 +1554,10 @@ fi

test -n "$ac_init_help" && exit $ac_status

if $ac_init_version; then

cat <<\_ACEOF

-libmtp configure 1.1.5

-generated by GNU Autoconf 2.68

+libmtp configure 1.1.12

+generated by GNU Autoconf 2.69

This configure script is free software; the Free Software Foundation

gives unlimited permission to copy, distribute and modify it.

_ACEOF

@@ -1606,7 +1633,7 @@ $as_echo "$ac_try_echo"; } >&5

test ! -s conftest.err

} && test -s conftest$ac_exeext && {

test "$cross_compiling" = yes ||

- $as_test_x conftest$ac_exeext

+ test -x conftest$ac_exeext

}; then :

ac_retval=0

else

@@ -2007,8 +2034,8 @@ cat >config.log <<_ACEOF

This file contains any messages produced by compilers while

running configure, to aid debugging if configure makes a mistake.

-It was created by libmtp $as_me 1.1.5, which was

-generated by GNU Autoconf 2.68. Invocation command line was

+It was created by libmtp $as_me 1.1.12, which was

+generated by GNU Autoconf 2.69. Invocation command line was

$ $0 $@

@@ -2356,7 +2383,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu

-am__api_version='1.11'

+am__api_version='1.15'

ac_aux_dir=

for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do

@@ -2424,7 +2451,7 @@ case $as_dir/ in #((

# by default.

for ac_prog in ginstall scoinst install; do

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then

if test $ac_prog = install &&

grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then

# AIX install. It has an incompatible calling convention.

@@ -2482,9 +2509,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5

$as_echo_n "checking whether build environment is sane... " >&6; }

-# Just in case

-sleep 1

-echo timestamp > conftest.file

# Reject unsafe characters in $srcdir or the absolute working directory

# name. Accept space and tab only in the latter.

am_lf='

@@ -2495,32 +2519,40 @@ case `pwd` in

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

+# Do 'set' in a subshell so we don't clobber the current shell's

# arguments. Must try -L first in case configure is actually a

# symlink; some systems play weird games with the mod time of symlinks

# (eg FreeBSD returns the mod time of the symlink's containing

# directory).

if (

- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`

- if test "$*" = "X"; then

- # -L didn't work.

- set X `ls -t "$srcdir/configure" conftest.file`

- fi

- rm -f conftest.file

- if test "$*" != "X $srcdir/configure conftest.file" \

- && test "$*" != "X conftest.file $srcdir/configure"; then

- # If neither matched, then we have a broken ls. This can happen

- # 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

-alias in your environment" "$LINENO" 5

- fi

+ am_has_slept=no

+ for am_try in 1 2; do

+ echo "timestamp, slept: $am_has_slept" > conftest.file

+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`

+ if test "$*" = "X"; then

+ # -L didn't work.

+ set X `ls -t "$srcdir/configure" conftest.file`

+ fi

+ if test "$*" != "X $srcdir/configure conftest.file" \

+ && test "$*" != "X conftest.file $srcdir/configure"; then

+ # If neither matched, then we have a broken ls. This can happen

+ # 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

+ alias in your environment" "$LINENO" 5

+ fi

+ if test "$2" = conftest.file || test $am_try -eq 2; then

+ break

+ fi

+ # Just in case.

+ sleep 1

+ am_has_slept=yes

+ done

test "$2" = conftest.file

)

then

@@ -2532,6 +2564,16 @@ Check your system clock" "$LINENO" 5

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

$as_echo "yes" >&6; }

+# If we didn't sleep, we still need to ensure time stamps of config.status and

+# generated files are strictly newer.

+am_sleep_pid=

+if grep 'slept: no' conftest.file >/dev/null 2>&1; then

+ ( sleep 1 ) &

+ am_sleep_pid=$!

+fi

+rm -f conftest.file

test "$program_prefix" != NONE &&

program_transform_name="s&^&$program_prefix&;$program_transform_name"

# Use a double $ so make ignores it.

@@ -2542,8 +2584,8 @@ test "$program_suffix" != NONE &&

ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'

program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`

-# expand $ac_aux_dir to an absolute path

-am_aux_dir=`cd $ac_aux_dir && pwd`

+# Expand $ac_aux_dir to an absolute path.

+am_aux_dir=`cd "$ac_aux_dir" && pwd`

if test x"${MISSING+set}" != xset; then

case $am_aux_dir in

@@ -2554,15 +2596,15 @@ if test x"${MISSING+set}" != xset; then

esac

# Use eval to expand $SHELL

-if eval "$MISSING --run true"; then

- am_missing_run="$MISSING --run "

+if eval "$MISSING --is-lightweight"; then

+ am_missing_run="$MISSING "

else

am_missing_run=

- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5

-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5

+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}

-if test x"${install_sh}" != xset; then

+if test x"${install_sh+set}" != xset; then

case $am_aux_dir in

*\ * | *\ *)

install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;

@@ -2571,10 +2613,10 @@ if test x"${install_sh}" != xset; then

esac

-# Installed binaries are usually stripped using `strip' when the user

-# run `make install-strip'. However `strip' might not be the right

+# Installed binaries are usually stripped using 'strip' when the user

+# run "make install-strip". However 'strip' might not be the right

# tool to use in cross-compilation environments, therefore Automake

-# will honor the `STRIP' environment variable to overrule this program.

+# will honor the 'STRIP' environment variable to overrule this program.

if test "$cross_compiling" != no; then

if test -n "$ac_tool_prefix"; then

# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.

@@ -2593,7 +2635,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_STRIP="${ac_tool_prefix}strip"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -2633,7 +2675,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_ac_ct_STRIP="strip"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -2684,7 +2726,7 @@ do

test -z "$as_dir" && as_dir=.

for ac_prog in mkdir gmkdir; do

for ac_exec_ext in '' $ac_executable_extensions; do

- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue

+ as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue

case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(

'mkdir (GNU coreutils) '* | \

'mkdir (coreutils) '* | \

@@ -2713,12 +2755,6 @@ fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5

$as_echo "$MKDIR_P" >&6; }

-mkdir_p="$MKDIR_P"

-case $mkdir_p in

- [\\/$]* | ?:[\\/]*) ;;

- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;

-esac

for ac_prog in gawk mawk nawk awk

# Extract the first word of "$ac_prog", so it can be a program name with args.

@@ -2737,7 +2773,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_AWK="$ac_prog"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -2801,6 +2837,45 @@ else

rmdir .tst 2>/dev/null

+# Check whether --enable-silent-rules was given.

+if test "${enable_silent_rules+set}" = set; then :

+ enableval=$enable_silent_rules;

+fi

+case $enable_silent_rules in # (((

+ yes) AM_DEFAULT_VERBOSITY=0;;

+ no) AM_DEFAULT_VERBOSITY=1;;

+ *) AM_DEFAULT_VERBOSITY=1;;

+esac

+am_make=${MAKE-make}

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5

+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }

+if ${am_cv_make_support_nested_variables+:} false; then :

+ $as_echo_n "(cached) " >&6

+else

+ if $as_echo 'TRUE=$(BAR$(V))

+BAR0=false

+BAR1=true

+V=1

+am__doit:

+ @$(TRUE)

+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then

+ am_cv_make_support_nested_variables=yes

+else

+ am_cv_make_support_nested_variables=no

+fi

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5

+$as_echo "$am_cv_make_support_nested_variables" >&6; }

+if test $am_cv_make_support_nested_variables = yes; then

+ AM_V='$(V)'

+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'

+else

+ AM_V=$AM_DEFAULT_VERBOSITY

+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY

+fi

+AM_BACKSLASH='\'

if test "`cd $srcdir && pwd`" != "`pwd`"; then

# Use -I$(srcdir) only when $(srcdir) != ., so that make's output

# is not polluted with repeated "-I."

@@ -2823,7 +2898,7 @@ fi

# Define the identity of the package.

PACKAGE='libmtp'

- VERSION='1.1.5'

+ VERSION='1.1.12'

cat >>confdefs.h <<_ACEOF

@@ -2851,12 +2926,22 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}

MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}

-# We need awk for the "check" target. The system "awk" is bad on

-# some platforms.

+# For better backward compatibility. To be removed once Automake 1.9.x

+# dies out for good. For more background, see:

+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>

+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>

+mkdir_p='$(MKDIR_P)'

+# We need awk for the "check" target (and possibly the TAP driver). The

+# system "awk" is bad on some platforms.

# Always define AMTAR for backward compatibility. Yes, it's still used

# in the wild :-( We should find a proper way to deprecate it ...

AMTAR='$${TAR-tar}'

+# We'll loop over all known methods to create a tar archive until one works.

+_am_tools='gnutar pax cpio none'

am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'

@@ -2864,6 +2949,49 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'

+# POSIX will say in a future version that running "rm -f" with no argument

+# is OK; and we want to be able to make that assumption in our Makefile

+# recipes. So use an aggressive probe to check that the usage we want is

+# actually supported "in the wild" to an acceptable degree.

+# See automake bug#10828.

+# To make any issue more visible, cause the running configure to be aborted

+# by default if the 'rm' program in use doesn't match our expectations; the

+# user can still override this though.

+if rm -f && rm -fr && rm -rf; then : OK; else

+ cat >&2 <<'END'

+Oops!

+Your 'rm' program seems unable to run without file operands specified

+on the command line, even when the '-f' option is present. This is contrary

+to the behaviour of most rm programs out there, and not conforming with

+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>

+Please tell bug-automake@gnu.org about your system, including the value

+of your $PATH and any error possibly output before this message. This

+can help us improve future automake versions.

+END

+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then

+ echo 'Configuration will proceed anyway, since you have set the' >&2

+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2

+ echo >&2

+ else

+ cat >&2 <<'END'

+Aborting the configuration process, to ensure you take notice of the issue.

+You can download and install GNU coreutils to get an 'rm' implementation

+that behaves properly: <http://www.gnu.org/software/coreutils/>.

+If you want to complete the configuration process using your problematic

+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM

+to "yes", and re-run configure.

+END

+ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5

+ fi

+fi

ac_config_headers="$ac_config_headers config.h"

@@ -2890,7 +3018,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_CC="${ac_tool_prefix}gcc"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -2930,7 +3058,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_ac_ct_CC="gcc"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -2983,7 +3111,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_CC="${ac_tool_prefix}cc"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -3024,7 +3152,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then

ac_prog_rejected=yes

continue

@@ -3082,7 +3210,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_CC="$ac_tool_prefix$ac_prog"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -3126,7 +3254,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_ac_ct_CC="$ac_prog"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -3572,8 +3700,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

/* end confdefs.h. */

#include <stdarg.h>

#include <stdio.h>

-#include <sys/types.h>

-#include <sys/stat.h>

+struct stat;

/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */

struct buf { int x; };

FILE * (*rcsopen) (struct buf *, struct stat *, int);

@@ -3657,6 +3784,65 @@ ac_cpp='$CPP $CPPFLAGS'

ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

ac_compiler_gnu=$ac_cv_c_compiler_gnu

+ac_ext=c

+ac_cpp='$CPP $CPPFLAGS'

+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

+ac_compiler_gnu=$ac_cv_c_compiler_gnu

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5

+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }

+if ${am_cv_prog_cc_c_o+:} false; then :

+ $as_echo_n "(cached) " >&6

+else

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

+/* end confdefs.h. */

+int

+main ()

+ ;

+ return 0;

+_ACEOF

+ # Make sure it works both with $CC and with simple cc.

+ # Following AC_PROG_CC_C_O, we do the test twice because some

+ # compilers refuse to overwrite an existing .o file with -o,

+ # though they will create one.

+ am_cv_prog_cc_c_o=yes

+ for am_i in 1 2; do

+ if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5

+ ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5

+ ac_status=$?

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

+ (exit $ac_status); } \

+ && test -f conftest2.$ac_objext; then

+ : OK

+ else

+ am_cv_prog_cc_c_o=no

+ break

+ fi

+ done

+ rm -f core conftest*

+ unset am_i

+fi

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5

+$as_echo "$am_cv_prog_cc_c_o" >&6; }

+if test "$am_cv_prog_cc_c_o" != yes; then

+ # Losing compiler, so override with the script.

+ # FIXME: It is wrong to rewrite CC.

+ # But if we don't then we get into trouble of one sort or another.

+ # A longer-term fix would be to have automake use am__CC in this case,

+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"

+ CC="$am_aux_dir/compile $CC"

+fi

+ac_ext=c

+ac_cpp='$CPP $CPPFLAGS'

+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

+ac_compiler_gnu=$ac_cv_c_compiler_gnu

DEPDIR="${am__leading_dot}deps"

ac_config_commands="$ac_config_commands depfiles"

@@ -3676,7 +3862,7 @@ am__quote=

_am_result=none

# First try GNU make style include.

echo "include confinc" > confmf

-# Ignore all kinds of additional output from `make'.

+# Ignore all kinds of additional output from 'make'.

case `$am_make -s -f confmf 2> /dev/null` in #(

*the\ am__doit\ target*)

am__include=include

@@ -3732,8 +3918,8 @@ else

# We make a subdir and do the tests there. Otherwise we can end up

# making bogus files that we don't know about and never remove. For

# instance it was reported that on HP-UX the gcc test will end up

- # making a dummy file named `D' -- because `-MD' means `put the output

- # in D'.

+ # making a dummy file named 'D' -- because '-MD' means "put the output

+ # in D".

rm -rf conftest.dir

mkdir conftest.dir

# Copy depcomp to subdir because otherwise we won't find it if we're

@@ -3768,16 +3954,16 @@ else

: > sub/conftest.c

for i in 1 2 3 4 5 6; do

echo '#include "conftst'$i'.h"' >> sub/conftest.c

- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with

- # Solaris 8's {/usr,}/bin/sh.

- touch sub/conftst$i.h

+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with

+ # Solaris 10 /bin/sh.

+ echo '/* dummy */' > sub/conftst$i.h

done

echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf

- # We check with `-c' and `-o' for the sake of the "dashmstdout"

+ # We check with '-c' and '-o' for the sake of the "dashmstdout"

# mode. It turns out that the SunPro C++ compiler does not properly

- # handle `-M -o', and we need to detect this. Also, some Intel

- # versions had trouble with output in subdirs

+ # handle '-M -o', and we need to detect this. Also, some Intel

+ # versions had trouble with output in subdirs.

am__obj=sub/conftest.${OBJEXT-o}

am__minus_obj="-o $am__obj"

case $depmode in

@@ -3786,8 +3972,8 @@ else

test "$am__universal" = false || continue

;;

nosideeffect)

- # after this tag, mechanisms are not by side-effect, so they'll

- # only be used when explicitly requested

+ # After this tag, mechanisms are not by side-effect, so they'll

+ # only be used when explicitly requested.

if test "x$enable_dependency_tracking" = xyes; then

continue

else

@@ -3795,7 +3981,7 @@ else

;;

msvc7 | msvc7msys | msvisualcpp | msvcmsys)

- # This compiler won't grok `-c -o', but also, the minuso test has

+ # This compiler won't grok '-c -o', but also, the minuso test has

# not run yet. These depmodes are late enough in the game, and

# so weak that their functioning should not be impacted.

am__obj=conftest.${OBJEXT-o}

@@ -3953,7 +4139,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_AS="${ac_tool_prefix}as"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -3993,7 +4179,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_ac_ct_AS="as"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -4045,7 +4231,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -4085,7 +4271,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_ac_ct_DLLTOOL="dlltool"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -4137,7 +4323,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -4177,7 +4363,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_ac_ct_OBJDUMP="objdump"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -4351,7 +4537,7 @@ do

for ac_prog in sed gsed; do

for ac_exec_ext in '' $ac_executable_extensions; do

ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"

- { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue

+ as_fn_executable_p "$ac_path_SED" || continue

# Check for GNU ac_path_SED and select it if it is found.

# Check for GNU $ac_path_SED

case `"$ac_path_SED" --version 2>&1` in

@@ -4427,7 +4613,7 @@ do

for ac_prog in grep ggrep; do

for ac_exec_ext in '' $ac_executable_extensions; do

ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"

- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue

+ as_fn_executable_p "$ac_path_GREP" || continue

# Check for GNU ac_path_GREP and select it if it is found.

# Check for GNU $ac_path_GREP

case `"$ac_path_GREP" --version 2>&1` in

@@ -4493,7 +4679,7 @@ do

for ac_prog in egrep; do

for ac_exec_ext in '' $ac_executable_extensions; do

ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"

- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue

+ as_fn_executable_p "$ac_path_EGREP" || continue

# Check for GNU ac_path_EGREP and select it if it is found.

# Check for GNU $ac_path_EGREP

case `"$ac_path_EGREP" --version 2>&1` in

@@ -4560,7 +4746,7 @@ do

for ac_prog in fgrep; do

for ac_exec_ext in '' $ac_executable_extensions; do

ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"

- { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue

+ as_fn_executable_p "$ac_path_FGREP" || continue

# Check for GNU ac_path_FGREP and select it if it is found.

# Check for GNU $ac_path_FGREP

case `"$ac_path_FGREP" --version 2>&1` in

@@ -4816,7 +5002,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -4860,7 +5046,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -5273,7 +5459,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -5313,7 +5499,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_ac_ct_OBJDUMP="objdump"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -5616,7 +5802,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -5656,7 +5842,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_ac_ct_DLLTOOL="dlltool"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -5757,7 +5943,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_AR="$ac_tool_prefix$ac_prog"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -5801,7 +5987,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_ac_ct_AR="$ac_prog"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -5926,7 +6112,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_STRIP="${ac_tool_prefix}strip"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -5966,7 +6152,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_ac_ct_STRIP="strip"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -6025,7 +6211,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -6065,7 +6251,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_ac_ct_RANLIB="ranlib"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -6557,7 +6743,7 @@ ia64-*-hpux*)

rm -rf conftest*

;;

-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \

+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \

s390*-*linux*|s390*-*tpf*|sparc*-*linux*)

# Find out which ABI we are using.

echo 'int i;' > conftest.$ac_ext

@@ -6575,7 +6761,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)

x86_64-*linux*)

LD="${LD-ld} -m elf_i386"

;;

- ppc64-*linux*|powerpc64-*linux*)

+ powerpc64le-*linux*)

+ LD="${LD-ld} -m elf32lppclinux"

+ ;;

+ powerpc64-*linux*)

LD="${LD-ld} -m elf32ppclinux"

;;

s390x-*linux*)

@@ -6594,7 +6783,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)

x86_64-*linux*)

LD="${LD-ld} -m elf_x86_64"

;;

- ppc*-*linux*|powerpc*-*linux*)

+ powerpcle-*linux*)

+ LD="${LD-ld} -m elf64lppc"

+ ;;

+ powerpc-*linux*)

LD="${LD-ld} -m elf64ppc"

;;

s390*-*linux*|s390*-*tpf*)

@@ -6714,7 +6906,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -6754,7 +6946,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -6834,7 +7026,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -6874,7 +7066,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -6926,7 +7118,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -6966,7 +7158,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_ac_ct_NMEDIT="nmedit"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -7018,7 +7210,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_LIPO="${ac_tool_prefix}lipo"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -7058,7 +7250,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_ac_ct_LIPO="lipo"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -7110,7 +7302,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_OTOOL="${ac_tool_prefix}otool"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -7150,7 +7342,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_ac_ct_OTOOL="otool"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -7202,7 +7394,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -7242,7 +7434,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_ac_ct_OTOOL64="otool64"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -10742,14 +10934,10 @@ fi

# before this can be enabled.

hardcode_into_libs=yes

- # Add ABI-specific directories to the system library path.

- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"

# Append ld.so.conf contents to the search path

if test -f /etc/ld.so.conf; then

lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`

- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"

+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"

# We used to test for /lib/ld.so.1 and disable shared libraries on

@@ -11748,6 +11936,7 @@ CC="$lt_save_CC"

prefix="$acl_save_prefix"

# Check whether --with-gnu-ld was given.

if test "${with_gnu_ld+set}" = set; then :

withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes

@@ -11758,21 +11947,21 @@ fi

# Prepare PATH_SEPARATOR.

# The user is always right.

if test "${PATH_SEPARATOR+set}" != set; then

- echo "#! /bin/sh" >conf$$.sh

- echo "exit 0" >>conf$$.sh

- chmod +x conf$$.sh

- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then

- PATH_SEPARATOR=';'

- else

- PATH_SEPARATOR=:

- fi

- rm -f conf$$.sh

+ # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which

+ # contains only /bin. Note that ksh looks also at the FPATH variable,

+ # so we have to set that as well for the test.

+ PATH_SEPARATOR=:

+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \

+ && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \

+ || PATH_SEPARATOR=';'

+ }

ac_prog=ld

if test "$GCC" = yes; then

# Check if gcc -print-prog-name=ld gives a path.

- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5

-$as_echo_n "checking for ld used by GCC... " >&6; }

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5

+$as_echo_n "checking for ld used by $CC... " >&6; }

case $host in

*-*-mingw*)

# gcc leaves a trailing carriage return which upsets mingw

@@ -11782,11 +11971,11 @@ $as_echo_n "checking for ld used by GCC... " >&6; }

esac

case $ac_prog in

# Accept absolute paths.

- [\\/]* | [A-Za-z]:[\\/]*)

+ [\\/]* | ?:[\\/]*)

re_direlt='/[^/][^/]*/\.\./'

- # Canonicalize the path of ld

- ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`

- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do

+ # Canonicalize the pathname of ld

+ ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`

+ while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do

ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`

done

test -z "$LD" && LD="$ac_prog"

@@ -11811,23 +12000,26 @@ if ${acl_cv_path_LD+:} false; then :

$as_echo_n "(cached) " >&6

else

if test -z "$LD"; then

- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"

+ acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR

for ac_dir in $PATH; do

+ IFS="$acl_save_ifs"

test -z "$ac_dir" && ac_dir=.

if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then

acl_cv_path_LD="$ac_dir/$ac_prog"

# Check to see if the program is GNU ld. I'd rather use --version,

- # but apparently some GNU ld's only accept -v.

+ # but apparently some variants of GNU ld only accept -v.

# Break only if it was the GNU/non-GNU ld that we prefer.

- case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in

+ case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in

*GNU* | *'with BFD'*)

- test "$with_gnu_ld" != no && break ;;

+ test "$with_gnu_ld" != no && break

+ ;;

- test "$with_gnu_ld" != yes && break ;;

+ test "$with_gnu_ld" != yes && break

+ ;;

esac

done

- IFS="$ac_save_ifs"

+ IFS="$acl_save_ifs"

else

acl_cv_path_LD="$LD" # Let the user override the test with a path.

@@ -11847,12 +12039,14 @@ $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }

if ${acl_cv_prog_gnu_ld+:} false; then :

$as_echo_n "(cached) " >&6

else

- # I'd rather use --version here, but apparently some GNU ld's only accept -v.

+ # I'd rather use --version here, but apparently some GNU lds only accept -v.

case `$LD -v 2>&1 </dev/null` in

*GNU* | *'with BFD'*)

- acl_cv_prog_gnu_ld=yes ;;

+ acl_cv_prog_gnu_ld=yes

+ ;;

- acl_cv_prog_gnu_ld=no ;;

+ acl_cv_prog_gnu_ld=no

+ ;;

esac

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5

@@ -12035,7 +12229,7 @@ fi

done

if test -z "$already_handled"; then

names_already_handled="$names_already_handled $name"

- uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`

+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`

eval value=\"\$HAVE_LIB$uppername\"

if test -n "$value"; then

if test "$value" = yes; then

@@ -12678,7 +12872,7 @@ _ACEOF

# Optionally set install location of udev

-UDEV=/lib/udev

+UDEV=/usr/lib/udev

# Check whether --with-udev was given.

if test "${with_udev+set}" = set; then :

@@ -12731,7 +12925,7 @@ else

ac_enable_doxygen=auto

-if test "x$ac_enable_doxygen" == "xyes"; then

+if test "x$ac_enable_doxygen" != "xno"; then

# Extract the first word of "doxygen", so it can be a program name with args.

set dummy doxygen; ac_word=$2

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

@@ -12748,7 +12942,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_HAVE_DOXYGEN="true"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -12773,8 +12967,10 @@ fi

if test "x$HAVE_DOXYGEN" = "xfalse" -a "x$ac_enable_doxygen" = "xyes"; then

as_fn_error $? "*** API documentation explicitly requested but Doxygen not found" "$LINENO" 5

- { $as_echo "$as_me:${as_lineno-$LINENO}: API documentation will be generated using Doxygen" >&5

+ if test "x$HAVE_DOXYGEN" = "xtrue"; then

+ { $as_echo "$as_me:${as_lineno-$LINENO}: API documentation will be generated using Doxygen" >&5

$as_echo "$as_me: API documentation will be generated using Doxygen" >&6;}

+ fi

else

HAVE_DOXYGEN=false

{ $as_echo "$as_me:${as_lineno-$LINENO}: API documentation will not be generated" >&5

@@ -12886,7 +13082,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_prog_ms_lib_exe="yes"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -12925,6 +13121,7 @@ fi

if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then

if test -n "$ac_tool_prefix"; then

# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.

@@ -12945,7 +13142,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -12988,7 +13185,7 @@ do

IFS=$as_save_IFS

test -z "$as_dir" && as_dir=.

for ac_exec_ext in '' $ac_executable_extensions; do

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

break 2

@@ -13053,6 +13250,7 @@ if test -n "$LIBUSB_CFLAGS"; then

$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

test $ac_status = 0; }; then

pkg_cv_LIBUSB_CFLAGS=`$PKG_CONFIG --cflags "libusb-1.0 >= 1.0.0" 2>/dev/null`

+ test "x$?" != "x0" && pkg_failed=yes

else

pkg_failed=yes

@@ -13069,6 +13267,7 @@ if test -n "$LIBUSB_LIBS"; then

$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

test $ac_status = 0; }; then

pkg_cv_LIBUSB_LIBS=`$PKG_CONFIG --libs "libusb-1.0 >= 1.0.0" 2>/dev/null`

+ test "x$?" != "x0" && pkg_failed=yes

else

pkg_failed=yes

@@ -13088,9 +13287,9 @@ else

_pkg_short_errors_supported=no

if test $_pkg_short_errors_supported = yes; then

- LIBUSB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libusb-1.0 >= 1.0.0" 2>&1`

+ LIBUSB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libusb-1.0 >= 1.0.0" 2>&1`

else

- LIBUSB_PKG_ERRORS=`$PKG_CONFIG --print-errors "libusb-1.0 >= 1.0.0" 2>&1`

+ LIBUSB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libusb-1.0 >= 1.0.0" 2>&1`

# Put the nasty error message in config.log where it belongs

echo "$LIBUSB_PKG_ERRORS" >&5

@@ -13157,6 +13356,7 @@ if test -n "$LIBUSB_CFLAGS"; then

$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

test $ac_status = 0; }; then

pkg_cv_LIBUSB_CFLAGS=`$PKG_CONFIG --cflags "libusb >= 0.1.8" 2>/dev/null`

+ test "x$?" != "x0" && pkg_failed=yes

else

pkg_failed=yes

@@ -13173,6 +13373,7 @@ if test -n "$LIBUSB_LIBS"; then

$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

test $ac_status = 0; }; then

pkg_cv_LIBUSB_LIBS=`$PKG_CONFIG --libs "libusb >= 0.1.8" 2>/dev/null`

+ test "x$?" != "x0" && pkg_failed=yes

else

pkg_failed=yes

@@ -13192,9 +13393,9 @@ else

_pkg_short_errors_supported=no

if test $_pkg_short_errors_supported = yes; then

- LIBUSB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libusb >= 0.1.8" 2>&1`

+ LIBUSB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libusb >= 0.1.8" 2>&1`

else

- LIBUSB_PKG_ERRORS=`$PKG_CONFIG --print-errors "libusb >= 0.1.8" 2>&1`

+ LIBUSB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libusb >= 0.1.8" 2>&1`

# Put the nasty error message in config.log where it belongs

echo "$LIBUSB_PKG_ERRORS" >&5

@@ -13391,6 +13592,7 @@ if test -n "$LIBUSB_CFLAGS"; then

$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

test $ac_status = 0; }; then

pkg_cv_LIBUSB_CFLAGS=`$PKG_CONFIG --cflags "libusb >= 0.1.8" 2>/dev/null`

+ test "x$?" != "x0" && pkg_failed=yes

else

pkg_failed=yes

@@ -13407,6 +13609,7 @@ if test -n "$LIBUSB_LIBS"; then

$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

test $ac_status = 0; }; then

pkg_cv_LIBUSB_LIBS=`$PKG_CONFIG --libs "libusb >= 0.1.8" 2>/dev/null`

+ test "x$?" != "x0" && pkg_failed=yes

else

pkg_failed=yes

@@ -13426,9 +13629,9 @@ else

_pkg_short_errors_supported=no

if test $_pkg_short_errors_supported = yes; then

- LIBUSB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libusb >= 0.1.8" 2>&1`

+ LIBUSB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libusb >= 0.1.8" 2>&1`

else

- LIBUSB_PKG_ERRORS=`$PKG_CONFIG --print-errors "libusb >= 0.1.8" 2>&1`

+ LIBUSB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libusb >= 0.1.8" 2>&1`

# Put the nasty error message in config.log where it belongs

echo "$LIBUSB_PKG_ERRORS" >&5

@@ -13866,11 +14069,11 @@ else

int

main ()

{

-/* FIXME: Include the comments suggested by Paul. */

#ifndef __cplusplus

- /* Ultrix mips cc rejects this. */

+ /* Ultrix mips cc rejects this sort of thing. */

typedef int charset[2];

- const charset cs;

+ const charset cs = { 0, 0 };

/* SunOS 4.1.1 cc rejects this. */

char const *const *pcpcc;

char **ppc;

@@ -13887,8 +14090,9 @@ main ()

++pcpcc;

ppc = (char**) pcpcc;

pcpcc = (char const *const *) ppc;

- { /* SCO 3.2v4 cc rejects this. */

- char *t;

+ { /* SCO 3.2v4 cc rejects this sort of thing. */

+ char tx;

+ char *t = &tx;

char const *s = 0 ? (char *) 0 : (char const *) 0;

*t++ = 0;

@@ -13904,10 +14108,10 @@ main ()

iptr p = 0;

++p;

}

- { /* AIX XL C 1.02.0.0 rejects this saying

+ { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying

"k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */

- struct s { int j; const int *ap[3]; };

- struct s *b; b->j = 5;

+ struct s { int j; const int *ap[3]; } bx;

+ struct s *b = &bx; b->j = 5;

}

{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */

const int foo = 10;

@@ -14005,73 +14209,6 @@ fi

# Checks for library functions.

-for ac_header in stdlib.h

-do :

- ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"

-if test "x$ac_cv_header_stdlib_h" = xyes; then :

- cat >>confdefs.h <<_ACEOF

-#define HAVE_STDLIB_H 1

-_ACEOF

-fi

-done

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5

-$as_echo_n "checking for GNU libc compatible malloc... " >&6; }

-if ${ac_cv_func_malloc_0_nonnull+:} false; then :

- $as_echo_n "(cached) " >&6

-else

- if test "$cross_compiling" = yes; then :

- ac_cv_func_malloc_0_nonnull=no

-else

- cat confdefs.h - <<_ACEOF >conftest.$ac_ext

-/* end confdefs.h. */

-#if defined STDC_HEADERS || defined HAVE_STDLIB_H

-# include <stdlib.h>

-#else

-char *malloc ();

-#endif

-int

-main ()

-return ! malloc (0);

- ;

- return 0;

-_ACEOF

-if ac_fn_c_try_run "$LINENO"; then :

- ac_cv_func_malloc_0_nonnull=yes

-else

- ac_cv_func_malloc_0_nonnull=no

-fi

-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \

- conftest.$ac_objext conftest.beam conftest.$ac_ext

-fi

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5

-$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }

-if test $ac_cv_func_malloc_0_nonnull = yes; then :

-$as_echo "#define HAVE_MALLOC 1" >>confdefs.h

-else

- $as_echo "#define HAVE_MALLOC 0" >>confdefs.h

- case " $LIBOBJS " in

- *" malloc.$ac_objext "* ) ;;

- *) LIBOBJS="$LIBOBJS malloc.$ac_objext"

- ;;

-esac

-$as_echo "#define malloc rpl_malloc" >>confdefs.h

-fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5

$as_echo_n "checking for working memcmp... " >&6; }

if ${ac_cv_func_memcmp_working+:} false; then :

@@ -14453,6 +14590,8 @@ _ACEOF

esac

rm -rf conftest*

# Stick in "-Werror" if you want to be more aggressive.

@@ -15533,7 +15672,6 @@ DEFS=-DHAVE_CONFIG_H

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$//'

@@ -15548,6 +15686,14 @@ LIBOBJS=$ac_libobjs

LTLIBOBJS=$ac_ltlibobjs

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5

+$as_echo_n "checking that generated files are newer than configure... " >&6; }

+ if test -n "$am_sleep_pid"; then

+ # Hide warnings about reused PIDs.

+ wait $am_sleep_pid 2>/dev/null

+ fi

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5

+$as_echo "done" >&6; }

if test -n "$EXEEXT"; then

am__EXEEXT_TRUE=

am__EXEEXT_FALSE='#'

@@ -15899,16 +16045,16 @@ if (echo >conf$$.file) 2>/dev/null; then

# ... but there are two gotchas:

# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.

# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.

- # In both cases, we have to default to `cp -p'.

+ # In both cases, we have to default to `cp -pR'.

ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||

- as_ln_s='cp -p'

+ as_ln_s='cp -pR'

elif ln conf$$.file conf$$ 2>/dev/null; then

as_ln_s=ln

else

- as_ln_s='cp -p'

+ as_ln_s='cp -pR'

else

- as_ln_s='cp -p'

+ as_ln_s='cp -pR'

rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file

rmdir conf$$.dir 2>/dev/null

@@ -15968,28 +16114,16 @@ else

as_mkdir_p=false

-if test -x / >/dev/null 2>&1; then

- as_test_x='test -x'

-else

- if ls -dL / >/dev/null 2>&1; then

- as_ls_L_option=L

- else

- as_ls_L_option=

- fi

- as_test_x='

- eval sh -c '\''

- if test -d "$1"; then

- test -d "$1/.";

- else

- case $1 in #(

- -*)set "./$1";;

- esac;

- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((

- ???[sx]*):;;*)false;;esac;fi

- '\'' sh

- '

-fi

-as_executable_p=$as_test_x

+# as_fn_executable_p FILE

+# -----------------------

+# Test if FILE is an executable regular file.

+as_fn_executable_p ()

+ test -f "$1" && test -x "$1"

+} # as_fn_executable_p

+as_test_x='test -x'

+as_executable_p=as_fn_executable_p

# Sed expression to map a string onto a valid CPP name.

as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"

@@ -16010,8 +16144,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

# report actual input values of CONFIG_FILES etc. instead of their

# values after options handling.

ac_log="

-This file was extended by libmtp $as_me 1.1.5, which was

-generated by GNU Autoconf 2.68. Invocation command line was

+This file was extended by libmtp $as_me 1.1.12, which was

+generated by GNU Autoconf 2.69. Invocation command line was

CONFIG_FILES = $CONFIG_FILES

CONFIG_HEADERS = $CONFIG_HEADERS

@@ -16076,11 +16210,11 @@ _ACEOF

cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"

ac_cs_version="\\

-libmtp config.status 1.1.5

-configured by $0, generated by GNU Autoconf 2.68,

+libmtp config.status 1.1.12

+configured by $0, generated by GNU Autoconf 2.69,

with options \\"\$ac_cs_config\\"

This config.status script is free software; the Free Software Foundation

gives unlimited permission to copy, distribute and modify it."

@@ -16171,7 +16305,7 @@ fi

_ACEOF

cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

if \$ac_cs_recheck; then

- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion

+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion

shift

\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6

CONFIG_SHELL='$SHELL'

@@ -17093,7 +17227,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}

case $ac_file$ac_mode in

"depfiles":C) test x"$AMDEP_TRUE" != x"" || {

- # Autoconf 2.62 quotes --file arguments for eval, but not when files

+ # Older Autoconf quotes --file arguments for eval, but not when files

# are listed without --file. Let's play safe and only enable the eval

# if we detect the quoting.

case $CONFIG_FILES in

@@ -17106,7 +17240,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}

# Strip MF so we end up with the name of the file.

mf=`echo "$mf" | sed -e 's/:.*$//'`

# Check whether this is an Automake generated Makefile or not.

- # We used to match only the files named `Makefile.in', but

+ # We used to match only the files named 'Makefile.in', but

# some people rename them; so instead we look at the file content.

# Grep'ing the first line is not enough: some people post-process

# each Makefile.in and add a new line on top of each file to say so.

@@ -17140,21 +17274,19 @@ $as_echo X"$mf" |

continue

# Extract the definition of DEPDIR, am__include, and am__quote

- # from the Makefile without running `make'.

+ # from the Makefile without running 'make'.

DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`

test -z "$DEPDIR" && continue

am__include=`sed -n 's/^am__include = //p' < "$mf"`

- test -z "am__include" && continue

+ test -z "$am__include" && continue

am__quote=`sed -n 's/^am__quote = //p' < "$mf"`

- # When using ansi2knr, U may be empty or an underscore; expand it

- U=`sed -n 's/^U = //p' < "$mf"`

# Find all dependency output files, they are included files with

# $(DEPDIR) in their names. We invoke sed twice because it is the

# simplest approach to changing $(DEPDIR) to its actual value in the

# expansion.

for file in `sed -n "

s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \

- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do

+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do

# Make sure the directory exists.

test -f "$dirpart/$file" && continue

fdir=`$as_dirname -- "$file" ||

« no previous file with comments | « config.h.in ('k') | configure.ac » ('j') | no next file with comments »