mirror of
https://github.com/love2d/love-android.git
synced 2026-08-21 21:15:34 +02:00
updated mpg123 to 1.17.0
This commit is contained in:
fysx
+1
-1
@@ -30,7 +30,7 @@ LOCAL_C_INCLUDES := \
|
||||
${LOCAL_PATH}/../freetype2-android/include \
|
||||
${LOCAL_PATH}/../freetype2-android/src \
|
||||
${LOCAL_PATH}/../physfs-2.0.3 \
|
||||
${LOCAL_PATH}/../mpg123-1.13.4/src/libmpg123 \
|
||||
${LOCAL_PATH}/../mpg123-1.17.0/src/libmpg123 \
|
||||
${LOCAL_PATH}/../libmodplug-0.8.8.4/src \
|
||||
${LOCAL_PATH}/../libvorbis-1.3.4/include \
|
||||
${LOCAL_PATH}/../LuaJIT-2.0.1/src \
|
||||
|
||||
@@ -1,118 +0,0 @@
|
||||
mpg123 install hints
|
||||
--------------------
|
||||
|
||||
(This file has very long lines - die-hard terminal nostalgists can be satisfied by `fmt -s -w 75 < INSTALL | less`. I think it's better to let the reader's preference rule than to preformat the stuff to some arbitrary width.)
|
||||
|
||||
There are now two basic ways to get your mpg123 installation consisting of
|
||||
|
||||
a) the mpg123 binary file
|
||||
- with libmpg123 as shared library or statically linked
|
||||
- with audio output plugins, or one statically linked
|
||||
b) a man page
|
||||
|
||||
(you may want to copy some of the documentation - README, etc - to /usr/share/doc/mpg123 or the like, too)
|
||||
|
||||
|
||||
0. Prerequesites
|
||||
|
||||
You really need:
|
||||
|
||||
- a C compiler; we try to keep the code ANSI C89/ISO C90 compatible
|
||||
gcc from 2.95 on should work, others, too - please report any issues
|
||||
Actually, we have a confirmed working build (svn trunk leading to release 0.67) on SunOS 4.1.4 with gcc-2.7.0 .
|
||||
|
||||
- an (UNIX-like) operating system with standard tools; MinGW32 and Cygwin are working for Microsoft Windows, too.
|
||||
- For the library only, you may get lucky with MSVC++ using the project files under ports/
|
||||
- For other exotic platforms, see ports/
|
||||
|
||||
You want:
|
||||
|
||||
- working assembler (recent GNU binutils) if using certain CPU optimizations
|
||||
|
||||
- headers and lib for certain audio output drivers (libasound for alsa, sdl for sdl...)
|
||||
|
||||
- libtool's libltdl for runtime output modules (this used to be included, but now we rely on an existing install)
|
||||
|
||||
|
||||
1. New installation via GNU autotools
|
||||
|
||||
The GNU 3-step procedure:
|
||||
|
||||
./configure
|
||||
make
|
||||
make install
|
||||
|
||||
Run
|
||||
|
||||
./configure --help
|
||||
|
||||
for a list of possible parameters you can specify. The obvious are --prefix and the normal GNU autotool bunch, but others include what audio subsystem to use and what CPU optimizations to build in.
|
||||
For the optimizations (decoder choice), the default on 32bit x86 systems since version 0.66 is a build that combines all possible optimizations and chooses one at runtime (see --cpu, --list-cpu and --test-cpu parameters).
|
||||
|
||||
Another possibly important choice is --with-seektable=<number> for setting the size for the table of stored frame addresses to make seeking faster. When you want a minimal memory footprint, you can set number to 0. Seeking will always start from the beginning, then - being accurate, but rather slow, what doesn't matter if you don't use interactive seeking forth and back.
|
||||
|
||||
There are various library features you can leave out via --disable options (like output formats, resampling modes). Please note that this is only configured/tested for the generic (fpu) decoder, not optimized ones. Perhaps that changes in future.
|
||||
|
||||
1a. Large file support
|
||||
|
||||
The libmpg123 API includes the generic off_t type for file offsets and thus is subject to shape-shifting on systems that change off_t depending on build flags.
|
||||
To deal with the incompatibilities that can cause, the library needs to separate code paths for small and large off_t.
|
||||
Since version 1.12.0, a large-file-enabled libmpg123 (the default set by configure) provides a dual-mode ABI. Depending on _FILE_OFFSET_BITS, the mpg123.h header file selects different library symbols to use for your app.
|
||||
In both large-file and normal mode, the library should just work for your app.
|
||||
|
||||
|
||||
2. The classic way via the provided Makefile
|
||||
|
||||
No, the Makefile is not provided anymore. Even if autotools is complicated, it is more cumbersome to take care of two build systems in parallel.
|
||||
You can dig in SVN for MakeLegacy.sh and src/Makefile.legacy and src/config.h.legacy, if you want.
|
||||
|
||||
Again, to be clear: There is no classic way anymore.
|
||||
|
||||
|
||||
3. Do something different on a special platform/compiler/...
|
||||
|
||||
Look into the ports/ directory for some traces of "porting" mpg123 or usually libmpg123 alone to different systems and compilers.
|
||||
|
||||
3a. Preparing Win32 binary packages.
|
||||
|
||||
Caution: You should make sure to use some gcc >= 4.2.0, even if it's still the experimental package for MinGW32.
|
||||
This helps preventing incompatibilities between generated DLL files and other compilers (it's about stack alignment).
|
||||
|
||||
Get MinGW/MSYS installed, run the MSYS shell.
|
||||
Enter the mpg123 source directory.
|
||||
Execute sh ./windows-builds.sh .
|
||||
|
||||
After some time, you should have some relevant files under releases/ (or releases\, for Windows people;-).
|
||||
You don't just get one build -- there are several variants, corresponding to what usually is to be found under http://mpg123.org/download/win32 .
|
||||
|
||||
|
||||
4. Have fun!
|
||||
|
||||
|
||||
These are some remarks from Michael that could still bear some relevance:
|
||||
|
||||
- There is currently no direct audio hardware support for the
|
||||
"dec" and "generic" targets. That means that you have to use
|
||||
the "-s" commandline option to write the decoded audio data
|
||||
to stdout.
|
||||
|
||||
- On Solaris, use Sun's SparcWorks compiler ("make solaris")
|
||||
if at all possible. It generates faster code than gcc, so
|
||||
use gcc only if there's no other way.
|
||||
|
||||
- The macro "htons" causes a compiler warning in httpget.c
|
||||
(at least on FreeBSD 2.1.x). This can be safely ignored.
|
||||
|
||||
- For Solaris 2.4: append the options "-L/usr/ucblib -lucb"
|
||||
at the end of the link command line. Do this ONLY for
|
||||
Solaris 2.4, NOT for Solaris 2.5 or newer versions.
|
||||
|
||||
- The HP-UX port might be broken. I was able to compile it
|
||||
on an HP-UX 9 account, but there were some problems with
|
||||
libraries on HP-UX 10. I'm not an HP expert, but perhaps
|
||||
someone else can fix it.
|
||||
[note: some people report NO problems also with HP-UX 10]
|
||||
|
||||
- IRIX: some people reported compile problems on IRIX 5.x (5.3)
|
||||
but 6.x seems to compile without problems
|
||||
|
||||
@@ -1,376 +0,0 @@
|
||||
#! /bin/sh
|
||||
# Common stub for a few missing GNU programs while installing.
|
||||
|
||||
scriptversion=2009-04-28.21; # UTC
|
||||
|
||||
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
|
||||
# 2008, 2009 Free Software Foundation, Inc.
|
||||
# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
|
||||
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2, or (at your option)
|
||||
# any later version.
|
||||
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# As a special exception to the GNU General Public License, if you
|
||||
# distribute this file as part of a program that contains a
|
||||
# configuration script generated by Autoconf, you may include it under
|
||||
# the same distribution terms that you use for the rest of that program.
|
||||
|
||||
if test $# -eq 0; then
|
||||
echo 1>&2 "Try \`$0 --help' for more information"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
run=:
|
||||
sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
|
||||
sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
|
||||
|
||||
# In the cases where this matters, `missing' is being run in the
|
||||
# srcdir already.
|
||||
if test -f configure.ac; then
|
||||
configure_ac=configure.ac
|
||||
else
|
||||
configure_ac=configure.in
|
||||
fi
|
||||
|
||||
msg="missing on your system"
|
||||
|
||||
case $1 in
|
||||
--run)
|
||||
# Try to run requested program, and just exit if it succeeds.
|
||||
run=
|
||||
shift
|
||||
"$@" && exit 0
|
||||
# Exit code 63 means version mismatch. This often happens
|
||||
# when the user try to use an ancient version of a tool on
|
||||
# a file that requires a minimum version. In this case we
|
||||
# we should proceed has if the program had been absent, or
|
||||
# if --run hadn't been passed.
|
||||
if test $? = 63; then
|
||||
run=:
|
||||
msg="probably too old"
|
||||
fi
|
||||
;;
|
||||
|
||||
-h|--h|--he|--hel|--help)
|
||||
echo "\
|
||||
$0 [OPTION]... PROGRAM [ARGUMENT]...
|
||||
|
||||
Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
|
||||
error status if there is no known handling for PROGRAM.
|
||||
|
||||
Options:
|
||||
-h, --help display this help and exit
|
||||
-v, --version output version information and exit
|
||||
--run try to run the given command, and emulate it if it fails
|
||||
|
||||
Supported PROGRAM values:
|
||||
aclocal touch file \`aclocal.m4'
|
||||
autoconf touch file \`configure'
|
||||
autoheader touch file \`config.h.in'
|
||||
autom4te touch the output file, or create a stub one
|
||||
automake touch all \`Makefile.in' files
|
||||
bison create \`y.tab.[ch]', if possible, from existing .[ch]
|
||||
flex create \`lex.yy.c', if possible, from existing .c
|
||||
help2man touch the output file
|
||||
lex create \`lex.yy.c', if possible, from existing .c
|
||||
makeinfo touch the output file
|
||||
tar try tar, gnutar, gtar, then tar without non-portable flags
|
||||
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
|
||||
|
||||
Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
|
||||
\`g' are ignored when checking the name.
|
||||
|
||||
Send bug reports to <bug-automake@gnu.org>."
|
||||
exit $?
|
||||
;;
|
||||
|
||||
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
|
||||
echo "missing $scriptversion (GNU Automake)"
|
||||
exit $?
|
||||
;;
|
||||
|
||||
-*)
|
||||
echo 1>&2 "$0: Unknown \`$1' option"
|
||||
echo 1>&2 "Try \`$0 --help' for more information"
|
||||
exit 1
|
||||
;;
|
||||
|
||||
esac
|
||||
|
||||
# normalize program name to check for.
|
||||
program=`echo "$1" | sed '
|
||||
s/^gnu-//; t
|
||||
s/^gnu//; t
|
||||
s/^g//; t'`
|
||||
|
||||
# Now exit if we have it, but it failed. Also exit now if we
|
||||
# don't have it and --version was passed (most likely to detect
|
||||
# the program). This is about non-GNU programs, so use $1 not
|
||||
# $program.
|
||||
case $1 in
|
||||
lex*|yacc*)
|
||||
# Not GNU programs, they don't have --version.
|
||||
;;
|
||||
|
||||
tar*)
|
||||
if test -n "$run"; then
|
||||
echo 1>&2 "ERROR: \`tar' requires --run"
|
||||
exit 1
|
||||
elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
|
||||
*)
|
||||
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
|
||||
# We have it, but it failed.
|
||||
exit 1
|
||||
elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
|
||||
# Could not run --version or --help. This is probably someone
|
||||
# running `$TOOL --version' or `$TOOL --help' to check whether
|
||||
# $TOOL exists and not knowing $TOOL uses missing.
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
# If it does not exist, or fails to run (possibly an outdated version),
|
||||
# try to emulate it.
|
||||
case $program in
|
||||
aclocal*)
|
||||
echo 1>&2 "\
|
||||
WARNING: \`$1' is $msg. You should only need it if
|
||||
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
|
||||
to install the \`Automake' and \`Perl' packages. Grab them from
|
||||
any GNU archive site."
|
||||
touch aclocal.m4
|
||||
;;
|
||||
|
||||
autoconf*)
|
||||
echo 1>&2 "\
|
||||
WARNING: \`$1' is $msg. You should only need it if
|
||||
you modified \`${configure_ac}'. You might want to install the
|
||||
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
|
||||
archive site."
|
||||
touch configure
|
||||
;;
|
||||
|
||||
autoheader*)
|
||||
echo 1>&2 "\
|
||||
WARNING: \`$1' is $msg. You should only need it if
|
||||
you modified \`acconfig.h' or \`${configure_ac}'. You might want
|
||||
to install the \`Autoconf' and \`GNU m4' packages. Grab them
|
||||
from any GNU archive site."
|
||||
files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
|
||||
test -z "$files" && files="config.h"
|
||||
touch_files=
|
||||
for f in $files; do
|
||||
case $f in
|
||||
*:*) touch_files="$touch_files "`echo "$f" |
|
||||
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
|
||||
*) touch_files="$touch_files $f.in";;
|
||||
esac
|
||||
done
|
||||
touch $touch_files
|
||||
;;
|
||||
|
||||
automake*)
|
||||
echo 1>&2 "\
|
||||
WARNING: \`$1' is $msg. You should only need it if
|
||||
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
|
||||
You might want to install the \`Automake' and \`Perl' packages.
|
||||
Grab them from any GNU archive site."
|
||||
find . -type f -name Makefile.am -print |
|
||||
sed 's/\.am$/.in/' |
|
||||
while read f; do touch "$f"; done
|
||||
;;
|
||||
|
||||
autom4te*)
|
||||
echo 1>&2 "\
|
||||
WARNING: \`$1' is needed, but is $msg.
|
||||
You might have modified some files without having the
|
||||
proper tools for further handling them.
|
||||
You can get \`$1' as part of \`Autoconf' from any GNU
|
||||
archive site."
|
||||
|
||||
file=`echo "$*" | sed -n "$sed_output"`
|
||||
test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
|
||||
if test -f "$file"; then
|
||||
touch $file
|
||||
else
|
||||
test -z "$file" || exec >$file
|
||||
echo "#! /bin/sh"
|
||||
echo "# Created by GNU Automake missing as a replacement of"
|
||||
echo "# $ $@"
|
||||
echo "exit 0"
|
||||
chmod +x $file
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
|
||||
bison*|yacc*)
|
||||
echo 1>&2 "\
|
||||
WARNING: \`$1' $msg. You should only need it if
|
||||
you modified a \`.y' file. You may need the \`Bison' package
|
||||
in order for those modifications to take effect. You can get
|
||||
\`Bison' from any GNU archive site."
|
||||
rm -f y.tab.c y.tab.h
|
||||
if test $# -ne 1; then
|
||||
eval LASTARG="\${$#}"
|
||||
case $LASTARG in
|
||||
*.y)
|
||||
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
|
||||
if test -f "$SRCFILE"; then
|
||||
cp "$SRCFILE" y.tab.c
|
||||
fi
|
||||
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
|
||||
if test -f "$SRCFILE"; then
|
||||
cp "$SRCFILE" y.tab.h
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
if test ! -f y.tab.h; then
|
||||
echo >y.tab.h
|
||||
fi
|
||||
if test ! -f y.tab.c; then
|
||||
echo 'main() { return 0; }' >y.tab.c
|
||||
fi
|
||||
;;
|
||||
|
||||
lex*|flex*)
|
||||
echo 1>&2 "\
|
||||
WARNING: \`$1' is $msg. You should only need it if
|
||||
you modified a \`.l' file. You may need the \`Flex' package
|
||||
in order for those modifications to take effect. You can get
|
||||
\`Flex' from any GNU archive site."
|
||||
rm -f lex.yy.c
|
||||
if test $# -ne 1; then
|
||||
eval LASTARG="\${$#}"
|
||||
case $LASTARG in
|
||||
*.l)
|
||||
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
|
||||
if test -f "$SRCFILE"; then
|
||||
cp "$SRCFILE" lex.yy.c
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
if test ! -f lex.yy.c; then
|
||||
echo 'main() { return 0; }' >lex.yy.c
|
||||
fi
|
||||
;;
|
||||
|
||||
help2man*)
|
||||
echo 1>&2 "\
|
||||
WARNING: \`$1' is $msg. You should only need it if
|
||||
you modified a dependency of a manual page. You may need the
|
||||
\`Help2man' package in order for those modifications to take
|
||||
effect. You can get \`Help2man' from any GNU archive site."
|
||||
|
||||
file=`echo "$*" | sed -n "$sed_output"`
|
||||
test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
|
||||
if test -f "$file"; then
|
||||
touch $file
|
||||
else
|
||||
test -z "$file" || exec >$file
|
||||
echo ".ab help2man is required to generate this page"
|
||||
exit $?
|
||||
fi
|
||||
;;
|
||||
|
||||
makeinfo*)
|
||||
echo 1>&2 "\
|
||||
WARNING: \`$1' is $msg. You should only need it if
|
||||
you modified a \`.texi' or \`.texinfo' file, or any other file
|
||||
indirectly affecting the aspect of the manual. The spurious
|
||||
call might also be the consequence of using a buggy \`make' (AIX,
|
||||
DU, IRIX). You might want to install the \`Texinfo' package or
|
||||
the \`GNU make' package. Grab either from any GNU archive site."
|
||||
# The file to touch is that specified with -o ...
|
||||
file=`echo "$*" | sed -n "$sed_output"`
|
||||
test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
|
||||
if test -z "$file"; then
|
||||
# ... or it is the one specified with @setfilename ...
|
||||
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
|
||||
file=`sed -n '
|
||||
/^@setfilename/{
|
||||
s/.* \([^ ]*\) *$/\1/
|
||||
p
|
||||
q
|
||||
}' $infile`
|
||||
# ... or it is derived from the source name (dir/f.texi becomes f.info)
|
||||
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
|
||||
fi
|
||||
# If the file does not exist, the user really needs makeinfo;
|
||||
# let's fail without touching anything.
|
||||
test -f $file || exit 1
|
||||
touch $file
|
||||
;;
|
||||
|
||||
tar*)
|
||||
shift
|
||||
|
||||
# We have already tried tar in the generic part.
|
||||
# Look for gnutar/gtar before invocation to avoid ugly error
|
||||
# messages.
|
||||
if (gnutar --version > /dev/null 2>&1); then
|
||||
gnutar "$@" && exit 0
|
||||
fi
|
||||
if (gtar --version > /dev/null 2>&1); then
|
||||
gtar "$@" && exit 0
|
||||
fi
|
||||
firstarg="$1"
|
||||
if shift; then
|
||||
case $firstarg in
|
||||
*o*)
|
||||
firstarg=`echo "$firstarg" | sed s/o//`
|
||||
tar "$firstarg" "$@" && exit 0
|
||||
;;
|
||||
esac
|
||||
case $firstarg in
|
||||
*h*)
|
||||
firstarg=`echo "$firstarg" | sed s/h//`
|
||||
tar "$firstarg" "$@" && exit 0
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
echo 1>&2 "\
|
||||
WARNING: I can't seem to be able to run \`tar' with the given arguments.
|
||||
You may want to install GNU tar or Free paxutils, or check the
|
||||
command line arguments."
|
||||
exit 1
|
||||
;;
|
||||
|
||||
*)
|
||||
echo 1>&2 "\
|
||||
WARNING: \`$1' is needed, and is $msg.
|
||||
You might have modified some files without having the
|
||||
proper tools for further handling them. Check the \`README' file,
|
||||
it often tells you about the needed prerequisites for installing
|
||||
this package. You may also peek at any GNU archive site, in case
|
||||
some other package would contain this missing \`$1' program."
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
exit 0
|
||||
|
||||
# Local variables:
|
||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
||||
# time-stamp-start: "scriptversion="
|
||||
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
||||
# time-stamp-time-zone: "UTC"
|
||||
# time-stamp-end: "; # UTC"
|
||||
# End:
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,244 +0,0 @@
|
||||
/*
|
||||
lfs_alias: Aliases to the small/native API functions with the size of long int as suffix.
|
||||
|
||||
copyright 2010 by the mpg123 project - free software under the terms of the LGPL 2.1
|
||||
see COPYING and AUTHORS files in distribution or http://mpg123.org
|
||||
initially written by Thomas Orgis
|
||||
|
||||
Use case: Client code on Linux/x86-64 that defines _FILE_OFFSET_BITS to 64, which is the only choice on that platform anyway. It should be no-op, but prompts the platform-agnostic header of mpg123 to define API calls with the corresponding suffix.
|
||||
This file provides the names for this case. It's cruft, but glibc does it, too -- so people rely on it.
|
||||
Oh, and it also caters for the lunatics that define _FILE_OFFSET_BITS=32 on 32 bit platforms.
|
||||
|
||||
There is also the strange case that the mpg123 build itself is configured for unnecessary _FILE_OFFSET_BITS == LFS_ALIAS_BITS =^ sizeof(long). In that case, the "native" function will have the suffix and the alias shall be provided without the suffix.
|
||||
|
||||
So, two basic cases:
|
||||
1. mpg123_bla_32 alias for mpg123_bla
|
||||
2. mpg123_bla alias for mpg123_bla_32
|
||||
Confusing, I know. It sucks.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
/* Hack for Solaris: Some system headers included from compat.h might force _FILE_OFFSET_BITS. Need to follow that here. */
|
||||
#include "compat.h"
|
||||
|
||||
#ifndef LFS_ALIAS_BITS
|
||||
#error "I need the count of alias bits here."
|
||||
#endif
|
||||
|
||||
#define MACROCAT_REALLY(a, b) a ## b
|
||||
#define MACROCAT(a, b) MACROCAT_REALLY(a, b)
|
||||
|
||||
/* This is wicked switchery: Decide which way the aliases are facing. */
|
||||
|
||||
#if _FILE_OFFSET_BITS+0 == LFS_ALIAS_BITS
|
||||
|
||||
/* The native functions are actually _with_ suffix, so let the mpg123 header use large file hackery to define the correct interfaces. */
|
||||
#include "mpg123.h"
|
||||
/* Don't forget to undef the function symbols before usage... */
|
||||
|
||||
/* The native functions have suffix, the aliases not. */
|
||||
#define NATIVE_SUFFIX MACROCAT(_, _FILE_OFFSET_BITS)
|
||||
#define NATIVE_NAME(func) MACROCAT(func, NATIVE_SUFFIX)
|
||||
#define ALIAS_NAME(func) func
|
||||
|
||||
#else
|
||||
|
||||
/* Native functions are without suffix... */
|
||||
#define MPG123_NO_LARGENAME
|
||||
#include "mpg123.h"
|
||||
|
||||
/* The alias functions have suffix, the native ones not. */
|
||||
#define ALIAS_SUFFIX MACROCAT(_, LFS_ALIAS_BITS)
|
||||
#define ALIAS_NAME(func) MACROCAT(func, ALIAS_SUFFIX)
|
||||
#define NATIVE_NAME(func) func
|
||||
|
||||
#endif
|
||||
|
||||
/* Now get the rest of the infrastructure on speed, namely attribute_align_arg, to stay safe. */
|
||||
#include "mpg123lib_intern.h"
|
||||
|
||||
/*
|
||||
Extract the list of functions we need wrappers for, pregenerating the wrappers for simple cases (inline script for nedit):
|
||||
perl -ne '
|
||||
if(/^\s*EXPORT\s+(\S+)\s+(mpg123_\S+)\((.*)\);\s*$/)
|
||||
{
|
||||
my $type = $1;
|
||||
my $name = $2;
|
||||
my $args = $3;
|
||||
next unless ($type =~ /off_t/ or $args =~ /off_t/ or ($name =~ /open/ and $name ne mpg123_open_feed));
|
||||
$type =~ s/off_t/long/g;
|
||||
my @nargs = ();
|
||||
$args =~ s/off_t/long/g;
|
||||
foreach my $a (split(/,/, $args))
|
||||
{
|
||||
$a =~ s/^.*\s\**([a-z_]+)$/$1/;
|
||||
push(@nargs, $a);
|
||||
}
|
||||
my $nargs = join(", ", @nargs);
|
||||
$nargs = "Human: figure me out." if($nargs =~ /\(/);
|
||||
print <<EOT
|
||||
|
||||
##ifdef $name
|
||||
##undef $name
|
||||
##endif
|
||||
$type attribute_align_arg ALIAS_NAME($name)($args)
|
||||
{
|
||||
return NATIVE_NAME($name)($nargs);
|
||||
}
|
||||
EOT
|
||||
|
||||
}' < mpg123.h.in
|
||||
*/
|
||||
|
||||
#ifdef mpg123_open
|
||||
#undef mpg123_open
|
||||
#endif
|
||||
int attribute_align_arg ALIAS_NAME(mpg123_open)(mpg123_handle *mh, const char *path)
|
||||
{
|
||||
return NATIVE_NAME(mpg123_open)(mh, path);
|
||||
}
|
||||
|
||||
#ifdef mpg123_open_fd
|
||||
#undef mpg123_open_fd
|
||||
#endif
|
||||
int attribute_align_arg ALIAS_NAME(mpg123_open_fd)(mpg123_handle *mh, int fd)
|
||||
{
|
||||
return NATIVE_NAME(mpg123_open_fd)(mh, fd);
|
||||
}
|
||||
|
||||
#ifdef mpg123_open_handle
|
||||
#undef mpg123_open_handle
|
||||
#endif
|
||||
int attribute_align_arg ALIAS_NAME(mpg123_open_handle)(mpg123_handle *mh, void *iohandle)
|
||||
{
|
||||
return NATIVE_NAME(mpg123_open_handle)(mh, iohandle);
|
||||
}
|
||||
|
||||
#ifdef mpg123_decode_frame
|
||||
#undef mpg123_decode_frame
|
||||
#endif
|
||||
int attribute_align_arg ALIAS_NAME(mpg123_decode_frame)(mpg123_handle *mh, long *num, unsigned char **audio, size_t *bytes)
|
||||
{
|
||||
return NATIVE_NAME(mpg123_decode_frame)(mh, num, audio, bytes);
|
||||
}
|
||||
|
||||
#ifdef mpg123_framebyframe_decode
|
||||
#undef mpg123_framebyframe_decode
|
||||
#endif
|
||||
int attribute_align_arg ALIAS_NAME(mpg123_framebyframe_decode)(mpg123_handle *mh, long *num, unsigned char **audio, size_t *bytes)
|
||||
{
|
||||
return NATIVE_NAME(mpg123_framebyframe_decode)(mh, num, audio, bytes);
|
||||
}
|
||||
|
||||
#ifdef mpg123_tell
|
||||
#undef mpg123_tell
|
||||
#endif
|
||||
long attribute_align_arg ALIAS_NAME(mpg123_tell)(mpg123_handle *mh)
|
||||
{
|
||||
return NATIVE_NAME(mpg123_tell)(mh);
|
||||
}
|
||||
|
||||
#ifdef mpg123_tellframe
|
||||
#undef mpg123_tellframe
|
||||
#endif
|
||||
long attribute_align_arg ALIAS_NAME(mpg123_tellframe)(mpg123_handle *mh)
|
||||
{
|
||||
return NATIVE_NAME(mpg123_tellframe)(mh);
|
||||
}
|
||||
|
||||
#ifdef mpg123_tell_stream
|
||||
#undef mpg123_tell_stream
|
||||
#endif
|
||||
long attribute_align_arg ALIAS_NAME(mpg123_tell_stream)(mpg123_handle *mh)
|
||||
{
|
||||
return NATIVE_NAME(mpg123_tell_stream)(mh);
|
||||
}
|
||||
|
||||
#ifdef mpg123_seek
|
||||
#undef mpg123_seek
|
||||
#endif
|
||||
long attribute_align_arg ALIAS_NAME(mpg123_seek)(mpg123_handle *mh, long sampleoff, int whence)
|
||||
{
|
||||
return NATIVE_NAME(mpg123_seek)(mh, sampleoff, whence);
|
||||
}
|
||||
|
||||
#ifdef mpg123_feedseek
|
||||
#undef mpg123_feedseek
|
||||
#endif
|
||||
long attribute_align_arg ALIAS_NAME(mpg123_feedseek)(mpg123_handle *mh, long sampleoff, int whence, long *input_offset)
|
||||
{
|
||||
return NATIVE_NAME(mpg123_feedseek)(mh, sampleoff, whence, input_offset);
|
||||
}
|
||||
|
||||
#ifdef mpg123_seek_frame
|
||||
#undef mpg123_seek_frame
|
||||
#endif
|
||||
long attribute_align_arg ALIAS_NAME(mpg123_seek_frame)(mpg123_handle *mh, long frameoff, int whence)
|
||||
{
|
||||
return NATIVE_NAME(mpg123_seek_frame)(mh, frameoff, whence);
|
||||
}
|
||||
|
||||
#ifdef mpg123_timeframe
|
||||
#undef mpg123_timeframe
|
||||
#endif
|
||||
long attribute_align_arg ALIAS_NAME(mpg123_timeframe)(mpg123_handle *mh, double sec)
|
||||
{
|
||||
return NATIVE_NAME(mpg123_timeframe)(mh, sec);
|
||||
}
|
||||
|
||||
#ifdef mpg123_index
|
||||
#undef mpg123_index
|
||||
#endif
|
||||
int attribute_align_arg ALIAS_NAME(mpg123_index)(mpg123_handle *mh, long **offsets, long *step, size_t *fill)
|
||||
{
|
||||
return NATIVE_NAME(mpg123_index)(mh, offsets, step, fill);
|
||||
}
|
||||
|
||||
#ifdef mpg123_set_index
|
||||
#undef mpg123_set_index
|
||||
#endif
|
||||
int attribute_align_arg ALIAS_NAME(mpg123_set_index)(mpg123_handle *mh, long *offsets, long step, size_t fill)
|
||||
{
|
||||
return NATIVE_NAME(mpg123_set_index)(mh, offsets, step, fill);
|
||||
}
|
||||
|
||||
#ifdef mpg123_position
|
||||
#undef mpg123_position
|
||||
#endif
|
||||
int attribute_align_arg ALIAS_NAME(mpg123_position)( mpg123_handle *mh, long frame_offset, long buffered_bytes, long *current_frame, long *frames_left, double *current_seconds, double *seconds_left)
|
||||
{
|
||||
return NATIVE_NAME(mpg123_position)(mh, frame_offset, buffered_bytes, current_frame, frames_left, current_seconds, seconds_left);
|
||||
}
|
||||
|
||||
#ifdef mpg123_length
|
||||
#undef mpg123_length
|
||||
#endif
|
||||
long attribute_align_arg ALIAS_NAME(mpg123_length)(mpg123_handle *mh)
|
||||
{
|
||||
return NATIVE_NAME(mpg123_length)(mh);
|
||||
}
|
||||
|
||||
#ifdef mpg123_set_filesize
|
||||
#undef mpg123_set_filesize
|
||||
#endif
|
||||
int attribute_align_arg ALIAS_NAME(mpg123_set_filesize)(mpg123_handle *mh, long size)
|
||||
{
|
||||
return NATIVE_NAME(mpg123_set_filesize)(mh, size);
|
||||
}
|
||||
|
||||
#ifdef mpg123_replace_reader
|
||||
#undef mpg123_replace_reader
|
||||
#endif
|
||||
int attribute_align_arg ALIAS_NAME(mpg123_replace_reader)(mpg123_handle *mh, ssize_t (*r_read) (int, void *, size_t), long (*r_lseek)(int, long, int))
|
||||
{
|
||||
return NATIVE_NAME(mpg123_replace_reader)(mh, r_read, r_lseek);
|
||||
}
|
||||
|
||||
#ifdef mpg123_replace_reader_handle
|
||||
#undef mpg123_replace_reader_handle
|
||||
#endif
|
||||
int attribute_align_arg ALIAS_NAME(mpg123_replace_reader_handle)(mpg123_handle *mh, ssize_t (*r_read) (void *, void *, size_t), long (*r_lseek)(void *, long, int), void (*cleanup)(void*))
|
||||
{
|
||||
return NATIVE_NAME(mpg123_replace_reader_handle)(mh, r_read, r_lseek, cleanup);
|
||||
}
|
||||
@@ -1,225 +0,0 @@
|
||||
#! /bin/bash
|
||||
|
||||
# mpg123 - temporary wrapper script for .libs/mpg123
|
||||
# Generated by libtool (GNU libtool) 2.4
|
||||
#
|
||||
# The mpg123 program cannot be directly executed until all the libtool
|
||||
# libraries that it depends on are installed.
|
||||
#
|
||||
# This wrapper script should never be moved out of the build directory.
|
||||
# If it is, it will not operate correctly.
|
||||
|
||||
# Sed substitution that helps us do robust quoting. It backslashifies
|
||||
# metacharacters that are still active within double-quoted strings.
|
||||
sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
|
||||
|
||||
# Be Bourne compatible
|
||||
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
||||
emulate sh
|
||||
NULLCMD=:
|
||||
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
|
||||
# is contrary to our usage. Disable this feature.
|
||||
alias -g '${1+"$@"}'='"$@"'
|
||||
setopt NO_GLOB_SUBST
|
||||
else
|
||||
case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
|
||||
fi
|
||||
BIN_SH=xpg4; export BIN_SH # for Tru64
|
||||
DUALCASE=1; export DUALCASE # for MKS sh
|
||||
|
||||
# The HP-UX ksh and POSIX shell print the target directory to stdout
|
||||
# if CDPATH is set.
|
||||
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
||||
|
||||
relink_command="(cd /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/src; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; { test -z \"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; }; }; PATH=/usr/lib/git-core:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games; export PATH; gcc -O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -g -O2 -o \$progdir/\$file audio.o buffer.o common.o compat.o control_generic.o equalizer.o getlopt.o httpget.o resolver.o genre.o mpg123.o metaprint.o local.o playlist.o streamdump.o term.o wav.o xfermem.o legacy_module.o output/dummy.o libmpg123/.libs/libmpg123.so -lm -Wl,-rpath -Wl,/home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/src/libmpg123/.libs)"
|
||||
|
||||
# This environment variable determines our operation mode.
|
||||
if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
|
||||
# install mode needs the following variables:
|
||||
generated_by_libtool_version='2.4'
|
||||
notinst_deplibs=' libmpg123/libmpg123.la'
|
||||
else
|
||||
# When we are sourced in execute mode, $file and $ECHO are already set.
|
||||
if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
|
||||
file="$0"
|
||||
|
||||
# A function that is used when there is no print builtin or printf.
|
||||
func_fallback_echo ()
|
||||
{
|
||||
eval 'cat <<_LTECHO_EOF
|
||||
$1
|
||||
_LTECHO_EOF'
|
||||
}
|
||||
ECHO="printf %s\\n"
|
||||
fi
|
||||
|
||||
# Very basic option parsing. These options are (a) specific to
|
||||
# the libtool wrapper, (b) are identical between the wrapper
|
||||
# /script/ and the wrapper /executable/ which is used only on
|
||||
# windows platforms, and (c) all begin with the string --lt-
|
||||
# (application programs are unlikely to have options which match
|
||||
# this pattern).
|
||||
#
|
||||
# There are only two supported options: --lt-debug and
|
||||
# --lt-dump-script. There is, deliberately, no --lt-help.
|
||||
#
|
||||
# The first argument to this parsing function should be the
|
||||
# script's ../libtool value, followed by no.
|
||||
lt_option_debug=
|
||||
func_parse_lt_options ()
|
||||
{
|
||||
lt_script_arg0=$0
|
||||
shift
|
||||
for lt_opt
|
||||
do
|
||||
case "$lt_opt" in
|
||||
--lt-debug) lt_option_debug=1 ;;
|
||||
--lt-dump-script)
|
||||
lt_dump_D=`$ECHO "X$lt_script_arg0" | /bin/sed -e 's/^X//' -e 's%/[^/]*$%%'`
|
||||
test "X$lt_dump_D" = "X$lt_script_arg0" && lt_dump_D=.
|
||||
lt_dump_F=`$ECHO "X$lt_script_arg0" | /bin/sed -e 's/^X//' -e 's%^.*/%%'`
|
||||
cat "$lt_dump_D/$lt_dump_F"
|
||||
exit 0
|
||||
;;
|
||||
--lt-*)
|
||||
$ECHO "Unrecognized --lt- option: '$lt_opt'" 1>&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
# Print the debug banner immediately:
|
||||
if test -n "$lt_option_debug"; then
|
||||
echo "mpg123:mpg123:${LINENO}: libtool wrapper (GNU libtool) 2.4" 1>&2
|
||||
fi
|
||||
}
|
||||
|
||||
# Used when --lt-debug. Prints its arguments to stdout
|
||||
# (redirection is the responsibility of the caller)
|
||||
func_lt_dump_args ()
|
||||
{
|
||||
lt_dump_args_N=1;
|
||||
for lt_arg
|
||||
do
|
||||
$ECHO "mpg123:mpg123:${LINENO}: newargv[$lt_dump_args_N]: $lt_arg"
|
||||
lt_dump_args_N=`expr $lt_dump_args_N + 1`
|
||||
done
|
||||
}
|
||||
|
||||
# Core function for launching the target application
|
||||
func_exec_program_core ()
|
||||
{
|
||||
|
||||
if test -n "$lt_option_debug"; then
|
||||
$ECHO "mpg123:mpg123:${LINENO}: newargv[0]: $progdir/$program" 1>&2
|
||||
func_lt_dump_args ${1+"$@"} 1>&2
|
||||
fi
|
||||
exec "$progdir/$program" ${1+"$@"}
|
||||
|
||||
$ECHO "$0: cannot exec $program $*" 1>&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
# A function to encapsulate launching the target application
|
||||
# Strips options in the --lt-* namespace from $@ and
|
||||
# launches target application with the remaining arguments.
|
||||
func_exec_program ()
|
||||
{
|
||||
for lt_wr_arg
|
||||
do
|
||||
case $lt_wr_arg in
|
||||
--lt-*) ;;
|
||||
*) set x "$@" "$lt_wr_arg"; shift;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
func_exec_program_core ${1+"$@"}
|
||||
}
|
||||
|
||||
# Parse options
|
||||
func_parse_lt_options "$0" ${1+"$@"}
|
||||
|
||||
# Find the directory that this script lives in.
|
||||
thisdir=`$ECHO "$file" | /bin/sed 's%/[^/]*$%%'`
|
||||
test "x$thisdir" = "x$file" && thisdir=.
|
||||
|
||||
# Follow symbolic links until we get to the real thisdir.
|
||||
file=`ls -ld "$file" | /bin/sed -n 's/.*-> //p'`
|
||||
while test -n "$file"; do
|
||||
destdir=`$ECHO "$file" | /bin/sed 's%/[^/]*$%%'`
|
||||
|
||||
# If there was a directory component, then change thisdir.
|
||||
if test "x$destdir" != "x$file"; then
|
||||
case "$destdir" in
|
||||
[\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;;
|
||||
*) thisdir="$thisdir/$destdir" ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
file=`$ECHO "$file" | /bin/sed 's%^.*/%%'`
|
||||
file=`ls -ld "$thisdir/$file" | /bin/sed -n 's/.*-> //p'`
|
||||
done
|
||||
|
||||
# Usually 'no', except on cygwin/mingw when embedded into
|
||||
# the cwrapper.
|
||||
WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=no
|
||||
if test "$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR" = "yes"; then
|
||||
# special case for '.'
|
||||
if test "$thisdir" = "."; then
|
||||
thisdir=`pwd`
|
||||
fi
|
||||
# remove .libs from thisdir
|
||||
case "$thisdir" in
|
||||
*[\\/].libs ) thisdir=`$ECHO "$thisdir" | /bin/sed 's%[\\/][^\\/]*$%%'` ;;
|
||||
.libs ) thisdir=. ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# Try to get the absolute directory name.
|
||||
absdir=`cd "$thisdir" && pwd`
|
||||
test -n "$absdir" && thisdir="$absdir"
|
||||
|
||||
program=lt-'mpg123'
|
||||
progdir="$thisdir/.libs"
|
||||
|
||||
if test ! -f "$progdir/$program" ||
|
||||
{ file=`ls -1dt "$progdir/$program" "$progdir/../$program" 2>/dev/null | /bin/sed 1q`; \
|
||||
test "X$file" != "X$progdir/$program"; }; then
|
||||
|
||||
file="$$-$program"
|
||||
|
||||
if test ! -d "$progdir"; then
|
||||
mkdir "$progdir"
|
||||
else
|
||||
rm -f "$progdir/$file"
|
||||
fi
|
||||
|
||||
# relink executable if necessary
|
||||
if test -n "$relink_command"; then
|
||||
if relink_command_output=`eval $relink_command 2>&1`; then :
|
||||
else
|
||||
printf %s\n "$relink_command_output" >&2
|
||||
rm -f "$progdir/$file"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
mv -f "$progdir/$file" "$progdir/$program" 2>/dev/null ||
|
||||
{ rm -f "$progdir/$program";
|
||||
mv -f "$progdir/$file" "$progdir/$program"; }
|
||||
rm -f "$progdir/$file"
|
||||
fi
|
||||
|
||||
if test -f "$progdir/$program"; then
|
||||
if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
|
||||
# Run the actual program with our arguments.
|
||||
func_exec_program ${1+"$@"}
|
||||
fi
|
||||
else
|
||||
# The program doesn't exist.
|
||||
$ECHO "$0: error: \`$progdir/$program' does not exist" 1>&2
|
||||
$ECHO "This script is just a wrapper for $program." 1>&2
|
||||
$ECHO "See the libtool documentation for more information." 1>&2
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,213 +0,0 @@
|
||||
/*
|
||||
sgi: audio output on SGI boxen
|
||||
|
||||
copyright ?-2006 by the mpg123 project - free software under the terms of the LGPL 2.1
|
||||
see COPYING and AUTHORS files in distribution or http://mpg123.org
|
||||
initially written (as it seems) by Thomas Woerner
|
||||
*/
|
||||
|
||||
#include <fcntl.h>
|
||||
|
||||
/* #include <audio.h> */
|
||||
#include <dmedia/audio.h>
|
||||
|
||||
#include "mpg123app.h"
|
||||
#include "debug.h"
|
||||
|
||||
|
||||
/* Analog output constant */
|
||||
static const char analog_output_res_name[] = ".AnalogOut";
|
||||
|
||||
|
||||
static int set_rate(audio_output_t *ao, ALconfig config)
|
||||
{
|
||||
int dev = alGetDevice(config);
|
||||
ALpv params[1];
|
||||
|
||||
/* Make sure the device is OK */
|
||||
if (dev < 0)
|
||||
{
|
||||
error1("set_rate: %s",alGetErrorString(oserror()));
|
||||
return 1;
|
||||
}
|
||||
|
||||
params[0].param = AL_OUTPUT_RATE;
|
||||
params[0].value.ll = alDoubleToFixed(ao->rate);
|
||||
|
||||
if (alSetParams(dev, params,1) < 0)
|
||||
error1("set_rate: %s",alGetErrorString(oserror()));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static int set_channels(audio_output_t *ao, ALconfig config)
|
||||
{
|
||||
int ret;
|
||||
|
||||
if(ao->channels == 2)
|
||||
ret = alSetChannels(config, AL_STEREO);
|
||||
else
|
||||
ret = alSetChannels(config, AL_MONO);
|
||||
|
||||
if (ret < 0)
|
||||
error1("set_channels : %s",alGetErrorString(oserror()));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int set_format(audio_output_t *ao, ALconfig config)
|
||||
{
|
||||
if (alSetSampFmt(config,AL_SAMPFMT_TWOSCOMP) < 0)
|
||||
error1("set_format : %s",alGetErrorString(oserror()));
|
||||
|
||||
if (alSetWidth(config,AL_SAMPLE_16) < 0)
|
||||
error1("set_format : %s",alGetErrorString(oserror()));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static int open_sgi(audio_output_t *ao)
|
||||
{
|
||||
int dev = AL_DEFAULT_OUTPUT;
|
||||
ALconfig config = alNewConfig();
|
||||
ALport port = NULL;
|
||||
|
||||
/* Test for correct completion */
|
||||
if (config == 0) {
|
||||
error1("open_sgi: %s",alGetErrorString(oserror()));
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Set port parameters */
|
||||
if(ao->channels == 2)
|
||||
alSetChannels(config, AL_STEREO);
|
||||
else
|
||||
alSetChannels(config, AL_MONO);
|
||||
|
||||
alSetWidth(config, AL_SAMPLE_16);
|
||||
alSetSampFmt(config,AL_SAMPFMT_TWOSCOMP);
|
||||
alSetQueueSize(config, 131069);
|
||||
|
||||
/* Setup output device to specified module. If there is no module
|
||||
specified in ao structure, use the default four output */
|
||||
if ((ao->device) != NULL) {
|
||||
char *dev_name;
|
||||
|
||||
dev_name=malloc((strlen(ao->device) + strlen(analog_output_res_name) + 1) *
|
||||
sizeof(char));
|
||||
|
||||
strcpy(dev_name,ao->device);
|
||||
strcat(dev_name,analog_output_res_name);
|
||||
|
||||
/* Find the asked device resource */
|
||||
dev=alGetResourceByName(AL_SYSTEM,dev_name,AL_DEVICE_TYPE);
|
||||
|
||||
/* Free allocated space */
|
||||
free(dev_name);
|
||||
|
||||
if (!dev) {
|
||||
error2("Invalid audio resource: %s (%s)",dev_name, alGetErrorString(oserror()));
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
/* Set the device */
|
||||
if (alSetDevice(config,dev) < 0)
|
||||
{
|
||||
error1("open_sgi: %s",alGetErrorString(oserror()));
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Open the audio port */
|
||||
port = alOpenPort("mpg123-VSC", "w", config);
|
||||
if(port == NULL) {
|
||||
error1("Unable to open audio channel: %s", alGetErrorString(oserror()));
|
||||
return -1;
|
||||
}
|
||||
|
||||
ao->handle = (void*)port;
|
||||
|
||||
|
||||
set_format(ao, config);
|
||||
set_channels(ao, config);
|
||||
set_rate(ao, config);
|
||||
|
||||
|
||||
alFreeConfig(config);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
static int get_formats_sgi(output_t *ao)
|
||||
{
|
||||
return MPG123_ENC_SIGNED_16;
|
||||
}
|
||||
|
||||
|
||||
static int write_sgi(audio_output_t *ao,unsigned char *buf,int len)
|
||||
{
|
||||
ALport port = (ALport)ao->handle;
|
||||
|
||||
if(ao->format == MPG123_ENC_SIGNED_8)
|
||||
alWriteFrames(port, buf, len>>1);
|
||||
else
|
||||
alWriteFrames(port, buf, len>>2);
|
||||
|
||||
return len;
|
||||
}
|
||||
|
||||
|
||||
static int close_sgi(audio_output_t *ao)
|
||||
{
|
||||
ALport port = (ALport)ao->handle;
|
||||
|
||||
if (port) {
|
||||
while(alGetFilled(port) > 0) sginap(1);
|
||||
alClosePort(port);
|
||||
ao->handle=NULL;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void flush_sgi(audio_output_t *ao)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
static int init_sgi(audio_output_t* ao)
|
||||
{
|
||||
if (ao==NULL) return -1;
|
||||
|
||||
/* Set callbacks */
|
||||
ao->open = open_sgi;
|
||||
ao->flush = flush_sgi;
|
||||
ao->write = write_sgi;
|
||||
ao->get_formats = get_formats_sgi;
|
||||
ao->close = close_sgi;
|
||||
|
||||
/* Success */
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/*
|
||||
Module information data structure
|
||||
*/
|
||||
mpg123_module_t mpg123_output_module_info = {
|
||||
/* api_version */ MPG123_MODULE_API_VERSION,
|
||||
/* name */ "sgi",
|
||||
/* description */ "Audio output for SGI.",
|
||||
/* revision */ "$Rev:$",
|
||||
/* handle */ NULL,
|
||||
|
||||
/* init_output */ init_sgi,
|
||||
};
|
||||
|
||||
|
||||
@@ -1,229 +0,0 @@
|
||||
/*
|
||||
win32: audio output for Windows 32bit
|
||||
|
||||
copyright ?-2007 by the mpg123 project - free software under the terms of the LGPL 2.1
|
||||
see COPYING and AUTHORS files in distribution or http://mpg123.org
|
||||
|
||||
initially written (as it seems) by Tony Million
|
||||
rewrite of basic functionality for callback-less and properly ringbuffered operation by ravenexp
|
||||
*/
|
||||
|
||||
#include "mpg123app.h"
|
||||
#include <windows.h>
|
||||
#include "debug.h"
|
||||
|
||||
/*
|
||||
Buffer size and number of buffers in the playback ring
|
||||
NOTE: This particular num/size combination performs best under heavy
|
||||
loads for my system, however this may not be true for any hardware/OS out there.
|
||||
Generally, BUFFER_SIZE < 8k || NUM_BUFFERS > 16 || NUM_BUFFERS < 4 are not recommended.
|
||||
*/
|
||||
#define BUFFER_SIZE 0x10000
|
||||
#define NUM_BUFFERS 8 /* total 512k roughly 2.5 sec of CD quality sound */
|
||||
|
||||
/* Buffer ring queue state */
|
||||
struct queue_state
|
||||
{
|
||||
WAVEHDR buffer_headers[NUM_BUFFERS];
|
||||
/* The next buffer to be filled and put in playback */
|
||||
int next_buffer;
|
||||
/* Buffer playback completion event */
|
||||
HANDLE play_done_event;
|
||||
HWAVEOUT waveout;
|
||||
};
|
||||
|
||||
static int open_win32(struct audio_output_struct *ao)
|
||||
{
|
||||
struct queue_state* state;
|
||||
int i;
|
||||
MMRESULT res;
|
||||
WAVEFORMATEX out_fmt;
|
||||
UINT dev_id;
|
||||
|
||||
if(!ao) return -1;
|
||||
if(ao->rate == -1) return 0;
|
||||
|
||||
/* Allocate queue state struct for this device */
|
||||
state = calloc(1, sizeof(struct queue_state));
|
||||
if(!state) return -1;
|
||||
|
||||
ao->userptr = state;
|
||||
/* Allocate playback buffers */
|
||||
for(i = 0; i < NUM_BUFFERS; i++)
|
||||
if(!(state->buffer_headers[i].lpData = malloc(BUFFER_SIZE)))
|
||||
ereturn(-1, "Out of memory for playback buffers.");
|
||||
|
||||
state->play_done_event = CreateEvent(0,FALSE,FALSE,0);
|
||||
if(state->play_done_event == INVALID_HANDLE_VALUE) return -1;
|
||||
|
||||
/* FIXME: real device enumeration by capabilities? */
|
||||
dev_id = WAVE_MAPPER; /* probably does the same thing */
|
||||
ao->device = "WaveMapper";
|
||||
/* FIXME: support for smth besides MPG123_ENC_SIGNED_16? */
|
||||
out_fmt.wFormatTag = WAVE_FORMAT_PCM;
|
||||
out_fmt.wBitsPerSample = 16;
|
||||
out_fmt.nChannels = ao->channels;
|
||||
out_fmt.nSamplesPerSec = ao->rate;
|
||||
out_fmt.nBlockAlign = out_fmt.nChannels*out_fmt.wBitsPerSample/8;
|
||||
out_fmt.nAvgBytesPerSec = out_fmt.nBlockAlign*out_fmt.nSamplesPerSec;
|
||||
out_fmt.cbSize = 0;
|
||||
|
||||
res = waveOutOpen(&state->waveout, dev_id, &out_fmt,
|
||||
(DWORD_PTR)state->play_done_event, 0, CALLBACK_EVENT);
|
||||
|
||||
switch(res)
|
||||
{
|
||||
case MMSYSERR_NOERROR:
|
||||
break;
|
||||
case MMSYSERR_ALLOCATED:
|
||||
ereturn(-1, "Audio output device is already allocated.");
|
||||
case MMSYSERR_NODRIVER:
|
||||
ereturn(-1, "No device driver is present.");
|
||||
case MMSYSERR_NOMEM:
|
||||
ereturn(-1, "Unable to allocate or lock memory.");
|
||||
case WAVERR_BADFORMAT:
|
||||
ereturn(-1, "Unsupported waveform-audio format.");
|
||||
default:
|
||||
ereturn(-1, "Unable to open wave output device.");
|
||||
}
|
||||
|
||||
/* Reset event from the "device open" message */
|
||||
ResetEvent(state->play_done_event);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int get_formats_win32(struct audio_output_struct *ao)
|
||||
{
|
||||
/* FIXME: support for smth besides MPG123_ENC_SIGNED_16? */
|
||||
return MPG123_ENC_SIGNED_16;
|
||||
}
|
||||
|
||||
/* Stores audio data to the fixed size buffers and pushes them into the playback queue.
|
||||
I have one grief with that: The last piece of a track may not reach the output,
|
||||
only full buffers sent... But we don't get smooth audio otherwise. */
|
||||
static int write_win32(struct audio_output_struct *ao, unsigned char *buf, int len)
|
||||
{
|
||||
struct queue_state* state;
|
||||
MMRESULT res;
|
||||
WAVEHDR* hdr;
|
||||
|
||||
int rest_len; /* Input data bytes left for next recursion. */
|
||||
int bufill; /* Bytes we stuff into buffer now. */
|
||||
|
||||
if(!ao || !ao->userptr) return -1;
|
||||
if(!buf || len <= 0) return 0;
|
||||
|
||||
state = (struct queue_state*)ao->userptr;
|
||||
hdr = &state->buffer_headers[state->next_buffer];
|
||||
|
||||
/* Check buffer header and wait if it's being played.
|
||||
Skip waiting if the buffer is not full yet */
|
||||
while(hdr->dwBufferLength == BUFFER_SIZE && !(hdr->dwFlags & WHDR_DONE))
|
||||
{
|
||||
/* debug1("waiting for buffer %i...", state->next_buffer); */
|
||||
WaitForSingleObject(state->play_done_event, INFINITE);
|
||||
}
|
||||
|
||||
/* If it was a full buffer being played, clean up. */
|
||||
if(hdr->dwFlags & WHDR_DONE)
|
||||
{
|
||||
waveOutUnprepareHeader(state->waveout, hdr, sizeof(WAVEHDR));
|
||||
hdr->dwFlags = 0;
|
||||
hdr->dwBufferLength = 0;
|
||||
}
|
||||
|
||||
/* Now see how much we want to stuff in and then stuff it in. */
|
||||
bufill = BUFFER_SIZE - hdr->dwBufferLength;
|
||||
if(len < bufill) bufill = len;
|
||||
|
||||
rest_len = len - bufill;
|
||||
memcpy(hdr->lpData + hdr->dwBufferLength, buf, bufill);
|
||||
hdr->dwBufferLength += bufill;
|
||||
if(hdr->dwBufferLength == BUFFER_SIZE)
|
||||
{ /* Send the buffer out when it's full. */
|
||||
res = waveOutPrepareHeader(state->waveout, hdr, sizeof(WAVEHDR));
|
||||
if(res != MMSYSERR_NOERROR) ereturn(-1, "Can't write to audio output device (prepare).");
|
||||
|
||||
res = waveOutWrite(state->waveout, hdr, sizeof(WAVEHDR));
|
||||
if(res != MMSYSERR_NOERROR) ereturn(-1, "Can't write to audio output device.");
|
||||
|
||||
/* Cycle to the next buffer in the ring queue */
|
||||
state->next_buffer = (state->next_buffer + 1) % NUM_BUFFERS;
|
||||
}
|
||||
/* I'd like to propagate error codes or something... but there are no catchable surprises left.
|
||||
Anyhow: Here is the recursion that makes ravenexp happy;-) */
|
||||
if(rest_len && write_win32(ao, buf + bufill, rest_len) < 0) /* Write the rest. */
|
||||
return -1;
|
||||
else
|
||||
return len;
|
||||
}
|
||||
|
||||
static void flush_win32(struct audio_output_struct *ao)
|
||||
{
|
||||
int i, z;
|
||||
struct queue_state* state;
|
||||
|
||||
if(!ao || !ao->userptr) return;
|
||||
state = (struct queue_state*)ao->userptr;
|
||||
|
||||
/* FIXME: The very last output buffer is not played. This could be a problem on the feeding side. */
|
||||
i = 0;
|
||||
z = state->next_buffer - 1;
|
||||
for(i = 0; i < NUM_BUFFERS; i++)
|
||||
{
|
||||
if(!state->buffer_headers[i].dwFlags & WHDR_DONE)
|
||||
WaitForSingleObject(state->play_done_event, INFINITE);
|
||||
|
||||
waveOutUnprepareHeader(state->waveout, &state->buffer_headers[i], sizeof(WAVEHDR));
|
||||
state->buffer_headers[i].dwFlags = 0;
|
||||
state->buffer_headers[i].dwBufferLength = 0;
|
||||
z = (z + 1) % NUM_BUFFERS;
|
||||
}
|
||||
}
|
||||
|
||||
static int close_win32(struct audio_output_struct *ao)
|
||||
{
|
||||
int i;
|
||||
struct queue_state* state;
|
||||
|
||||
if(!ao || !ao->userptr) return -1;
|
||||
state = (struct queue_state*)ao->userptr;
|
||||
|
||||
flush_win32(ao);
|
||||
waveOutClose(state->waveout);
|
||||
CloseHandle(state->play_done_event);
|
||||
|
||||
for(i = 0; i < NUM_BUFFERS; i++) free(state->buffer_headers[i].lpData);
|
||||
|
||||
free(ao->userptr);
|
||||
ao->userptr = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int init_win32(audio_output_t* ao)
|
||||
{
|
||||
if(!ao) return -1;
|
||||
|
||||
/* Set callbacks */
|
||||
ao->open = open_win32;
|
||||
ao->flush = flush_win32;
|
||||
ao->write = write_win32;
|
||||
ao->get_formats = get_formats_win32;
|
||||
ao->close = close_win32;
|
||||
|
||||
/* Success */
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
Module information data structure
|
||||
*/
|
||||
mpg123_module_t mpg123_output_module_info = {
|
||||
/* api_version */ MPG123_MODULE_API_VERSION,
|
||||
/* name */ "win32",
|
||||
/* description */ "Audio output for Windows (winmm).",
|
||||
/* revision */ "$Rev:$",
|
||||
/* handle */ NULL,
|
||||
|
||||
/* init_output */ init_win32,
|
||||
};
|
||||
@@ -1,255 +0,0 @@
|
||||
/*
|
||||
seek-accuracy: Take some given mpeg file and validate that seeks are indeed accurate.
|
||||
|
||||
copyright 2009 by the mpg123 project - free software under the terms of the LGPL 2.1
|
||||
see COPYING and AUTHORS files in distribution or http://mpg123.org
|
||||
initially written by Thomas Orgis
|
||||
|
||||
arguments: decoder testfile.mpeg
|
||||
*/
|
||||
|
||||
#include <mpg123.h>
|
||||
#include <compat.h>
|
||||
|
||||
#define SAMPLES 1000
|
||||
/* Cannot use the const value as fixed array size:-( */
|
||||
const size_t samples = SAMPLES;
|
||||
|
||||
/* Use getlopt.c in future? But heck, don't bloat. */
|
||||
enum theargs
|
||||
{
|
||||
arg_binname = 0
|
||||
,arg_decoder
|
||||
,arg_preframes
|
||||
,arg_file
|
||||
,arg_total
|
||||
};
|
||||
|
||||
const char* filename;
|
||||
int channels;
|
||||
mpg123_handle *m;
|
||||
size_t first_sample_errs = 0;
|
||||
|
||||
|
||||
int check_seeking(size_t *errs);
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
int ret = 0;
|
||||
size_t errs[2] = {0, 0};
|
||||
size_t errs_ntom[2] = {0, 0};
|
||||
|
||||
if(argc < arg_total)
|
||||
{
|
||||
fprintf(stderr, "\nUsage: %s <decoder> <preframes> <mpeg audio file>\n\n", argv[0]);
|
||||
return -1;
|
||||
}
|
||||
mpg123_init();
|
||||
m = mpg123_new(argv[arg_decoder], NULL);
|
||||
mpg123_param(m, MPG123_RESYNC_LIMIT, -1, 0);
|
||||
|
||||
if(mpg123_param(m, MPG123_PREFRAMES, atol(argv[arg_preframes]), 0) == MPG123_OK)
|
||||
printf("Testing library with preframes set to %li\n", atol(argv[arg_preframes]));
|
||||
|
||||
filename = argv[arg_file];
|
||||
ret = check_seeking(errs);
|
||||
|
||||
if(ret == 0)
|
||||
{
|
||||
printf("Now with NtoM resampling to 33333 Hz!");
|
||||
mpg123_param(m, MPG123_FORCE_RATE, 33333, 0);
|
||||
ret = check_seeking(errs_ntom);
|
||||
}
|
||||
else fprintf(stderr, "Some failure occured! Unable to test properly!");
|
||||
|
||||
printf("\n");
|
||||
printf("1to1 indexed seek errors: %"SIZE_P" / %"SIZE_P"\n", (size_p)errs[0],(size_p)samples);
|
||||
printf("1to1 non-indexed seek errors: %"SIZE_P" / %"SIZE_P"\n", (size_p)errs[1],(size_p)samples);
|
||||
printf("NtoM indexed seek errors: %"SIZE_P" / %"SIZE_P"\n", (size_p)errs_ntom[0],(size_p)samples);
|
||||
printf("NtoM non-indexed seek errors: %"SIZE_P" / %"SIZE_P"\n", (size_p)errs_ntom[1],(size_p)samples);
|
||||
printf("Errors in getting first sample again: %"SIZE_P"\n", first_sample_errs);
|
||||
printf("\n");
|
||||
|
||||
if(ret == 0)
|
||||
{
|
||||
|
||||
if(first_sample_errs == 0 && errs[0] == 0 && errs[1] == 0 && errs_ntom[0] == 0 && errs_ntom[1] == 0)
|
||||
{
|
||||
printf("Congratulations, all seeks were accurate!\n");
|
||||
printf("But be warned: Not _all_ sample offsets have been tested. This result just means that the basic mechanism of sample-accurate seeking seems to work.\n");
|
||||
}
|
||||
else
|
||||
{
|
||||
printf("There have been some errors. For layer 3 files, this may be due to too low MPG123_PREFRAMES.\n");
|
||||
ret = -1;
|
||||
}
|
||||
|
||||
}
|
||||
else fprintf(stderr, "Some bad failure during checking!\n");
|
||||
|
||||
mpg123_delete(m);
|
||||
mpg123_exit();
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
int open_file()
|
||||
{
|
||||
if( mpg123_open(m, filename) == MPG123_OK
|
||||
&&
|
||||
mpg123_getformat(m, NULL, &channels, NULL) == MPG123_OK )
|
||||
{
|
||||
printf("Channels: %i\n", channels);
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
printf("Opening file failed: %s\n", mpg123_strerror(m));
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
/* Operation:
|
||||
Read through the whole file and remember selected samples and their position.
|
||||
Then, seek to the positions selectively and compare.
|
||||
Second mode: Check if this is identical to fresh decoding and seek (without frame index table)... less important now, focusing on the first one.
|
||||
*/
|
||||
|
||||
struct seeko
|
||||
{
|
||||
off_t position[SAMPLES];
|
||||
short left[SAMPLES];
|
||||
short right[SAMPLES];
|
||||
};
|
||||
|
||||
/* select some positions to check seek accuracy on */
|
||||
void fix_positions(struct seeko *so, off_t length)
|
||||
{
|
||||
off_t step = (length-1)/(samples-1);
|
||||
size_t i;
|
||||
/* simple fixed stepping, in order (one could shuffle this) */
|
||||
for(i=0; i<samples-1; ++i)
|
||||
so->position[i] = i*step;
|
||||
|
||||
/* plus the last one! */
|
||||
so->position[samples-1] = length-1;
|
||||
}
|
||||
|
||||
int collect(struct seeko *so)
|
||||
{
|
||||
off_t pos_count = 0;
|
||||
off_t length;
|
||||
int err = MPG123_OK;
|
||||
size_t posi = 0;
|
||||
mpg123_scan(m);
|
||||
length = mpg123_length(m);
|
||||
printf("Estimated length: %"OFF_P"\n", (off_p)length);
|
||||
/* Compute the interesting positions */
|
||||
fix_positions(so, length);
|
||||
/*
|
||||
Default format is always 16bit int, rate does not matter.
|
||||
Let's just get the channel count and not bother.
|
||||
*/
|
||||
while(err == MPG123_OK)
|
||||
{
|
||||
short buff[1024]; /* choosing a non-divider of mpeg frame size on purpose */
|
||||
size_t got = 0;
|
||||
off_t buffsamples;
|
||||
err = mpg123_read(m, (unsigned char*)buff, 1024*sizeof(short), &got);
|
||||
buffsamples = got/(channels*sizeof(short));
|
||||
while(so->position[posi] < pos_count+buffsamples)
|
||||
{
|
||||
size_t i = (so->position[posi]-pos_count)*channels;
|
||||
printf("got sample %"SIZE_P" (%"OFF_P")\n", (size_p)posi, (off_p)so->position[posi]);
|
||||
so->left[posi] = buff[i];
|
||||
if(channels == 2)
|
||||
so->right[posi] = buff[i+1];
|
||||
|
||||
if(++posi >= samples) break;
|
||||
}
|
||||
if(posi >= samples) break;
|
||||
|
||||
pos_count += buffsamples;
|
||||
}
|
||||
if(err != MPG123_DONE && err != MPG123_OK)
|
||||
{
|
||||
printf("An error occured (not done)?: %s\n", mpg123_strerror(m));
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int check_sample(struct seeko *so, size_t i)
|
||||
{
|
||||
short buf[2]; /* at max one left and right sample */
|
||||
size_t got = 0;
|
||||
|
||||
if(mpg123_seek(m, so->position[i], SEEK_SET) != so->position[i])
|
||||
{
|
||||
printf("Error seeking to %"OFF_P": %s\n", (off_p)so->position[i], mpg123_strerror(m));
|
||||
return -1;
|
||||
}
|
||||
|
||||
if( mpg123_read(m, (unsigned char*)buf, channels*sizeof(short), &got) != MPG123_OK
|
||||
||
|
||||
got/sizeof(short) != channels )
|
||||
{
|
||||
printf("Error occured on reading sample %"SIZE_P"! (%s)\n", (size_p)i, mpg123_strerror(m));
|
||||
return -1;
|
||||
}
|
||||
if(buf[0] == so->left[i] && (channels == 1 || buf[1] == so->right[i]))
|
||||
{
|
||||
printf("sample %"SIZE_P" PASS\n", (size_p)i);
|
||||
}
|
||||
else
|
||||
{
|
||||
if(channels == 1) printf("sample %"SIZE_P" FAIL (%i != %i)\n", (size_p)i, buf[0], so->left[i]);
|
||||
else printf("sample %"SIZE_P" FAIL (%i != %i || %i != %i)\n", (size_p)i, buf[0], so->left[i], buf[1], so->right[i]);
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
size_t check_positions(struct seeko *so)
|
||||
{
|
||||
size_t i;
|
||||
size_t errs = 0;
|
||||
printf("Seeking and comparing...\n");
|
||||
for(i=0; i<samples; ++i)
|
||||
{
|
||||
if(check_sample(so, i) != 0)
|
||||
++errs;
|
||||
}
|
||||
printf("Check the first one again, seeking back from the end.\n");
|
||||
if(check_sample(so, 0) != 0)
|
||||
++first_sample_errs;
|
||||
|
||||
return errs;
|
||||
}
|
||||
|
||||
int check_seeking(size_t *errs)
|
||||
{
|
||||
struct seeko so;
|
||||
int ret = 0;
|
||||
|
||||
/* First opening. */
|
||||
if(open_file() != 0) return -1;
|
||||
|
||||
printf("Collecting samples...\n");
|
||||
ret = collect(&so);
|
||||
if(ret != 0) return ret;
|
||||
|
||||
errs[0] = check_positions(&so);
|
||||
|
||||
printf("With fresh opening (empty seek index):\n");
|
||||
if(open_file() != 0) return -1;
|
||||
|
||||
errs[1] = check_positions(&so);
|
||||
|
||||
printf("Another fresh Opening to see if first sample works:\n");
|
||||
if(open_file() != 0) return -1;
|
||||
if(check_sample(&so, 0) != 0)
|
||||
++first_sample_errs;
|
||||
|
||||
return ret;
|
||||
}
|
||||
@@ -1,65 +0,0 @@
|
||||
#include "config.h"
|
||||
#include "mpg123app.h"
|
||||
#include "debug.h"
|
||||
|
||||
#ifdef WANT_WIN32_UNICODE
|
||||
int win32_cmdline_utf8(int * argc, char *** argv)
|
||||
{
|
||||
wchar_t **argv_wide;
|
||||
char *argvptr;
|
||||
int argcounter;
|
||||
|
||||
/* That's too lame. */
|
||||
if(argv == NULL || argc == NULL) return -1;
|
||||
|
||||
argv_wide = CommandLineToArgvW(GetCommandLineW(), argc);
|
||||
if(argv_wide == NULL){ error("Cannot get wide command line."); return -1; }
|
||||
|
||||
*argv = (char **)calloc(sizeof (char *), *argc);
|
||||
if(*argv == NULL){ error("Cannot allocate memory for command line."); return -1; }
|
||||
|
||||
for(argcounter = 0; argcounter < *argc; argcounter++)
|
||||
{
|
||||
win32_wide_utf8(argv_wide[argcounter], (const char **)&argvptr, NULL);
|
||||
(*argv)[argcounter] = argvptr;
|
||||
}
|
||||
LocalFree(argv_wide); /* We don't need it anymore */
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void win32_cmdline_free(int argc, char **argv)
|
||||
{
|
||||
int i;
|
||||
|
||||
if(argv == NULL) return;
|
||||
|
||||
for(i=0; i<argc; ++i) free(argv[i]);
|
||||
}
|
||||
#endif /* WIN32_WANT_UNICODE */
|
||||
|
||||
void win32_set_priority (const int arg)
|
||||
{
|
||||
DWORD proc_result = 0;
|
||||
HANDLE current_proc = NULL;
|
||||
if (arg) {
|
||||
if ((current_proc = GetCurrentProcess()))
|
||||
{
|
||||
switch (arg) {
|
||||
case -2: proc_result = SetPriorityClass(current_proc, IDLE_PRIORITY_CLASS); break;
|
||||
case -1: proc_result = SetPriorityClass(current_proc, BELOW_NORMAL_PRIORITY_CLASS); break;
|
||||
case 0: proc_result = SetPriorityClass(current_proc, NORMAL_PRIORITY_CLASS); break; /*default priority*/
|
||||
case 1: proc_result = SetPriorityClass(current_proc, ABOVE_NORMAL_PRIORITY_CLASS); break;
|
||||
case 2: proc_result = SetPriorityClass(current_proc, HIGH_PRIORITY_CLASS); break;
|
||||
case 3: proc_result = SetPriorityClass(current_proc, REALTIME_PRIORITY_CLASS); break;
|
||||
default: fprintf(stderr,"Unknown priority class specified\n");
|
||||
}
|
||||
if(!proc_result) {
|
||||
fprintf(stderr,"SetPriorityClass failed\n");
|
||||
}
|
||||
}
|
||||
else {
|
||||
fprintf(stderr,"GetCurrentProcess failed\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -5,6 +5,10 @@ You are explicitly not allowed to send them unwanted business offers or to quest
|
||||
|
||||
Current maintainers with various sorts of contributions:
|
||||
Thomas Orgis <thomas@orgis.org>
|
||||
Patrick Dehne <patrick@steidle.net>
|
||||
Jonathan Yong <10walls@gmail.com>
|
||||
|
||||
Co-initiator of the revived mpg123 project, but not that involved anymore:
|
||||
Nicholas J Humfrey <njh@ecs.soton.ac.uk>
|
||||
|
||||
Generic address pointing to the current maintainer (hopefully still works in future in case maintainership will change again): <maintainer@mpg123.org>
|
||||
@@ -13,13 +17,18 @@ The creator: Michael Hipp (email: hippm@informatik.uni-tuebingen.de - please bot
|
||||
|
||||
Contributions/ideas Thomas Orgis era (includes backports from mhipp trunk):
|
||||
|
||||
Jonathan Yong (jon_y) <10walls@gmail.com>: win32 hacking
|
||||
Jarno Lehtinen <lehtinen@sci.fi>: tinyalsa output
|
||||
Anthony Wells <borgboyone@yahoo.com>: initial version of ID3v2 APIC patch
|
||||
David Wohlferd <limegreensocks@yahoo.com>: Win32 WaveOut buffer destructor fix.
|
||||
Mike Gorchak <mike.gorchak.qnx@gmail.com>: QNX native audio output (QSA)
|
||||
Dan McGee <dpmcgee@gmail.com>: various patches (also for test suite)
|
||||
Jonathan Yong (jon_y) <10walls@gmail.com>: win32 hacking, win32 wasapi audio.
|
||||
Malcolm Boczek <MBoczek@terraindustries.com>: Common language runtime wrapper
|
||||
Elbert Pol (TeLLie) <elbert.pol@gmail.com>: OS/2 port fixup
|
||||
Jeroen Valkonet <jvalkon@xs4all.nl>: motivate pitch control, suggestive patch for pitch command in generic control interface
|
||||
Andy Hefner <ahefner@gmail.com>: patch for that second UTF16 issue
|
||||
Taihei Monma <tmkk@mac.com>: A whole lot of new/improved assembler code, including Altivec!
|
||||
Christian Weisgerber <naddy@openbsd.org>: sndio output
|
||||
Christian Weisgerber <naddy@openbsd.org>, Brad Smith: sndio output
|
||||
Patrick Dehne (P4tr3ck) <patrick@steidle.net>: more MSVC++ porting, patch to handle missing bit reservoirs
|
||||
Thorsten Glaser <tg@mirbsd.de>: icy2utf8, suggest utf8 locale stuff
|
||||
Dan Smith <dan@algenta.com>: ABI fixes for ensuring stack alignment (esp. for MinGW-built DLL with MSVC)
|
||||
@@ -15,6 +15,9 @@ LOCAL_SRC_FILES := \
|
||||
src/libmpg123/dct64_altivec.c \
|
||||
src/libmpg123/dct64_i386.c src/libmpg123/dct64_i486.c \
|
||||
src/libmpg123/synth_altivec.c src/libmpg123/synth_i486.c \
|
||||
src/libmpg123/synth_real.c \
|
||||
src/libmpg123/synth_s32.c \
|
||||
src/libmpg123/lfs_wrap.c \
|
||||
src/libmpg123/testcpu.c \
|
||||
, $(subst $(LOCAL_PATH)/,,\
|
||||
$(wildcard ${LOCAL_PATH}/src/libmpg123/*.c) ))
|
||||
@@ -1,25 +1,24 @@
|
||||
This is the file that contains the terms of use, copying, etc. for the mpg123 distribution package.
|
||||
|
||||
Main message:
|
||||
Main message, to include in "About ..." boxes, etc:
|
||||
|
||||
Code is copyrighted by Michael Hipp, who made it free software under the terms of the LGPL 2.1.
|
||||
Copyright (c) 1995-2013 by Michael Hipp and others,
|
||||
free software under the terms of the LGPL v2.1
|
||||
|
||||
But that is not all of it.
|
||||
mpg123 is licensed under the GNU General Lesser Public License, version 2.1, and in parts under the GNU General Public License, version 2.
|
||||
That means that _all_ of mpg123 is licensed under GPL and the major part also under the LGPL.
|
||||
There is an attempt to cover the actual list of authors in the AUTHORS file.
|
||||
Project maintainer since 2006 is Thomas Orgis and many people have contributed
|
||||
since the Michael Hipp era, but he stays the initial source and it would
|
||||
be impractical to count them all individually, so it's "and others".
|
||||
Source files contain the phrase "the mpg123 project" to the same effect
|
||||
in their license boilerplate; especially those that were added after
|
||||
maintainership changed. The person mainly responsible for the first version
|
||||
is usually named in the phrase "initially written by ...".
|
||||
|
||||
Actually, the "major part" currently is the whole distributed package of mpg123. There are some files (old alsa output, libao output) that you get from our svn repository and that do not fall under LGPL.
|
||||
|
||||
When the copyright marker in a source file says "the mpg123 project" that means that the file contains code copyrighted by contributors to mpg123, the "initially written by" naming the person(s) that created the file and thus may have the largest part of copyrights on it.
|
||||
I am explaining this here to emphasize that the copyright always actually lies by the individual member (i.e. contributor to) of the mpg123 project who wrote a specific section of code.
|
||||
Usage of a source code management system like Subversion should provide keeping track of individual copyright traces...
|
||||
|
||||
Please consider that any code that is contributed to the mpg123 project shall be licensed under LGPL 2.1 .
|
||||
If you want to contribute, but don't agree to that (i.e. you want to have your code GPL only) please say so - then, we either you convince is to include your code under GPL, we convince you to make it LGPL instead or, as a last resort, you'll have to do you own GPLed fork.
|
||||
But we should try to avoid the last option...
|
||||
|
||||
All files in the distribution that don't carry a license note on their own are licensed under the terms of the LGPL 2.1; all files that do carry either a LGPL or GPL note are licensed respectively under the LGPL or GPL as follows:
|
||||
All files in the distribution that don't carry a license note on their own are
|
||||
licensed under the terms of the LGPL 2.1; exceptions may apply, especially to
|
||||
files not in the official distribution but in the revision control repository.
|
||||
|
||||
The formal license text follows.
|
||||
|
||||
=======================
|
||||
1. The LGPL version 2.1
|
||||
@@ -0,0 +1,111 @@
|
||||
mpg123 install hints
|
||||
--------------------
|
||||
|
||||
(This file has very long lines - die-hard terminal nostalgists can be satisfied by `fmt -s -w 75 < INSTALL | less`. I think it's better to let the reader's preference rule than to preformat the stuff to some arbitrary width.)
|
||||
|
||||
|
||||
0. Prerequesites
|
||||
|
||||
You really need:
|
||||
|
||||
- a C compiler; we try to keep the code ANSI C89/ISO C90 compatible
|
||||
gcc from 2.95 on should work, others, too - please report any issues
|
||||
Actually, we have a confirmed working build (svn trunk leading to release 0.67) on SunOS 4.1.4 with gcc-2.7.0 .
|
||||
|
||||
- an (UNIX-like) operating system with standard tools; MinGW32 and Cygwin are working for Microsoft Windows, too. We also have users happily on OS/2.
|
||||
- For the library only, you may get lucky with MSVC++ using the project files under ports/
|
||||
- For other exotic platforms, also see ports/
|
||||
- If building from direct SCM checkout, you need GNU autotools installed (see below).
|
||||
|
||||
You want:
|
||||
|
||||
- working assembler (recent GNU binutils) if using certain CPU optimizations
|
||||
- headers and lib for certain audio output drivers (libasound for alsa, sdl for sdl...)
|
||||
- libtool's libltdl for runtime output modules (this used to be included, but now we rely on an existing install)
|
||||
|
||||
|
||||
1. Build
|
||||
|
||||
There is one main supported way to get your mpg123 installation consisting of
|
||||
|
||||
a) the mpg123 binary file
|
||||
- with libmpg123 as shared library or statically linked
|
||||
- with audio output plugins, or one statically linked
|
||||
b) a man page
|
||||
|
||||
(you may want to copy some of the documentation - README, etc - to /usr/share/doc/mpg123 or the like, too)
|
||||
|
||||
This way is the usual GNU 3-step procedure:
|
||||
|
||||
./configure
|
||||
make
|
||||
make install
|
||||
|
||||
Run
|
||||
|
||||
./configure --help
|
||||
|
||||
for a list of possible parameters you can specify in the configuration step. The obvious are --prefix and the normal GNU autotool bunch, but others include what audio subsystem to use and what CPU optimizations to build in.
|
||||
For the optimizations (decoder choice), the default is a build that combines all usable optimizations for the platform and chooses one at runtime (see --cpu, --list-cpu and --test-cpu parameters).
|
||||
|
||||
There are various parameters you can tune, but of course the defaults are what is mainly tested.
|
||||
|
||||
Also, various library features can be left out via --disable options (like output formats, resampling modes). That way, you can strive for a minimal build that only does what you really need. Not every combination of library features is tested regularily, so you might hit some speed bumps, but usually stuff that is easily worked out (at least for the mpg123 team when you report it).
|
||||
|
||||
An example (working on mpg123 trunk r3062):
|
||||
|
||||
CFLAGS="-Os -s" ./configure --with-cpu=generic --disable-id3v2 --disable-lfs-alias --disable-feature-report --with-seektable=0 --disable-16bit --disable-32bit --disable-8bit --disable-messages --disable-feeder --disable-ntom --disable-downsample --disable-icy && make
|
||||
|
||||
That, and further application of `strip --strip-unneeded`, yields a lean 93 KiB shared library for MPEG layer I/II/III decoding to floating point on my x86-64 system (it should be a bit smaller on 32 bit systems). When disabling layers I and II, too, that goes down to 81 KiB.
|
||||
|
||||
The shared library of a full build weighs 170 KiB after stripping.
|
||||
|
||||
|
||||
2. Developer build
|
||||
|
||||
This project uses GNU autotools (no specific version, but they should be fairly recent), also libtool. You need to have those installed, as it is usually the case for build environments based on the GNU toolchain.
|
||||
|
||||
One a fresh SCM checkout, or after changing things in configure.ac, you need to run
|
||||
|
||||
autoreconf -iv
|
||||
|
||||
to prepare the configure script. Then you can build as per point 1.
|
||||
|
||||
|
||||
3. Library-only build
|
||||
|
||||
If you do not want to build the whole thing, but only the library, run
|
||||
|
||||
./configure
|
||||
cd src/libmpg123
|
||||
make
|
||||
|
||||
You can then find the library itself under src/libmpg123/.libs (libtool likes to hide things there).
|
||||
|
||||
|
||||
4. Exotic platforms
|
||||
|
||||
See the ports/ directory for some help for building at least libmpg123 without the UNIX shell / autotools. The main strategy is to write a config.h to replace what configure would generate and then have a correct listing of all source files involved in that configuration (there are optional files for different decoder choices, for example).
|
||||
|
||||
Then compile objects, link.
|
||||
|
||||
|
||||
4a. Preparing Win32 binary packages.
|
||||
|
||||
Caution: You should make sure to use some gcc >= 4.2.0, even if it's still the experimental package for MinGW32.
|
||||
This helps preventing incompatibilities between generated DLL files and other compilers (it's about stack alignment).
|
||||
|
||||
Get MinGW/MSYS installed, run the MSYS shell.
|
||||
Enter the mpg123 source directory.
|
||||
Execute sh ./windows-builds.sh .
|
||||
|
||||
After some time, you should have some relevant files under releases/ (or releases\, for Windows people;-).
|
||||
You don't just get one build -- there are several variants, corresponding to what usually is to be found under http://mpg123.org/download/win32 .
|
||||
|
||||
|
||||
5. Note on large file support
|
||||
|
||||
The libmpg123 API includes the generic off_t type for file offsets and thus is subject to shape-shifting on systems that change off_t depending on build flags.
|
||||
To deal with the incompatibilities that can cause, the library needs to separate code paths for small and large off_t.
|
||||
Since version 1.12.0, a large-file-enabled libmpg123 (the default set by configure) provides a dual-mode ABI. Depending on _FILE_OFFSET_BITS, the mpg123.h header file selects different library symbols to use for your app.
|
||||
In both large-file and normal mode, the library should just work for your app.
|
||||
@@ -1,9 +1,8 @@
|
||||
# Makefile.in generated by automake 1.11 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.14 from Makefile.am.
|
||||
# Makefile. Generated from Makefile.in by configure.
|
||||
|
||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
||||
# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
||||
# Inc.
|
||||
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
|
||||
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
@@ -16,6 +15,51 @@
|
||||
|
||||
|
||||
|
||||
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
|
||||
am__make_running_with_option = \
|
||||
case $${target_option-} in \
|
||||
?) ;; \
|
||||
*) echo "am__make_running_with_option: internal error: invalid" \
|
||||
"target option '$${target_option-}' specified" >&2; \
|
||||
exit 1;; \
|
||||
esac; \
|
||||
has_opt=no; \
|
||||
sane_makeflags=$$MAKEFLAGS; \
|
||||
if $(am__is_gnu_make); then \
|
||||
sane_makeflags=$$MFLAGS; \
|
||||
else \
|
||||
case $$MAKEFLAGS in \
|
||||
*\\[\ \ ]*) \
|
||||
bs=\\; \
|
||||
sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
|
||||
| sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
|
||||
esac; \
|
||||
fi; \
|
||||
skip_next=no; \
|
||||
strip_trailopt () \
|
||||
{ \
|
||||
flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
|
||||
}; \
|
||||
for flg in $$sane_makeflags; do \
|
||||
test $$skip_next = yes && { skip_next=no; continue; }; \
|
||||
case $$flg in \
|
||||
*=*|--*) continue;; \
|
||||
-*I) strip_trailopt 'I'; skip_next=yes;; \
|
||||
-*I?*) strip_trailopt 'I';; \
|
||||
-*O) strip_trailopt 'O'; skip_next=yes;; \
|
||||
-*O?*) strip_trailopt 'O';; \
|
||||
-*l) strip_trailopt 'l'; skip_next=yes;; \
|
||||
-*l?*) strip_trailopt 'l';; \
|
||||
-[dEDm]) skip_next=yes;; \
|
||||
-[JT]) skip_next=yes;; \
|
||||
esac; \
|
||||
case $$flg in \
|
||||
*$$target_option*) has_opt=yes; break;; \
|
||||
esac; \
|
||||
done; \
|
||||
test $$has_opt = yes
|
||||
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
|
||||
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
|
||||
pkgdatadir = $(datadir)/mpg123
|
||||
pkgincludedir = $(includedir)/mpg123
|
||||
pkglibdir = $(libdir)/mpg123
|
||||
@@ -32,15 +76,19 @@ POST_INSTALL = :
|
||||
NORMAL_UNINSTALL = :
|
||||
PRE_UNINSTALL = :
|
||||
POST_UNINSTALL = :
|
||||
build_triplet = i686-pc-linux-gnu
|
||||
host_triplet = i686-pc-linux-gnu
|
||||
build_triplet = 86_64-unknown-linux-gnu
|
||||
host_triplet = arm-unknown-linux-androideabi
|
||||
subdir = .
|
||||
DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
|
||||
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
|
||||
DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
|
||||
$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
|
||||
$(top_srcdir)/configure $(am__configure_deps) \
|
||||
$(srcdir)/libmpg123.pc.in $(srcdir)/mpg123.spec.in \
|
||||
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
|
||||
TODO build/config.guess build/config.sub build/depcomp \
|
||||
build/install-sh build/ltmain.sh build/missing
|
||||
$(dist_man_MANS) COPYING TODO build/compile build/config.guess \
|
||||
build/config.sub build/depcomp build/install-sh build/missing \
|
||||
build/ltmain.sh $(top_srcdir)/build/compile \
|
||||
$(top_srcdir)/build/config.guess \
|
||||
$(top_srcdir)/build/config.sub $(top_srcdir)/build/install-sh \
|
||||
$(top_srcdir)/build/ltmain.sh $(top_srcdir)/build/missing
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/m4/addrconfig.m4 \
|
||||
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
|
||||
@@ -54,15 +102,33 @@ mkinstalldirs = $(install_sh) -d
|
||||
CONFIG_HEADER = $(top_builddir)/src/config.h
|
||||
CONFIG_CLEAN_FILES = libmpg123.pc mpg123.spec
|
||||
CONFIG_CLEAN_VPATH_FILES =
|
||||
AM_V_P = $(am__v_P_$(V))
|
||||
am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY))
|
||||
am__v_P_0 = false
|
||||
am__v_P_1 = :
|
||||
AM_V_GEN = $(am__v_GEN_$(V))
|
||||
am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
|
||||
am__v_GEN_0 = @echo " GEN " $@;
|
||||
am__v_GEN_1 =
|
||||
AM_V_at = $(am__v_at_$(V))
|
||||
am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
|
||||
am__v_at_0 = @
|
||||
am__v_at_1 =
|
||||
SOURCES =
|
||||
DIST_SOURCES =
|
||||
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
|
||||
html-recursive info-recursive install-data-recursive \
|
||||
install-dvi-recursive install-exec-recursive \
|
||||
install-html-recursive install-info-recursive \
|
||||
install-pdf-recursive install-ps-recursive install-recursive \
|
||||
installcheck-recursive installdirs-recursive pdf-recursive \
|
||||
ps-recursive uninstall-recursive
|
||||
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
|
||||
ctags-recursive dvi-recursive html-recursive info-recursive \
|
||||
install-data-recursive install-dvi-recursive \
|
||||
install-exec-recursive install-html-recursive \
|
||||
install-info-recursive install-pdf-recursive \
|
||||
install-ps-recursive install-recursive installcheck-recursive \
|
||||
installdirs-recursive pdf-recursive ps-recursive \
|
||||
tags-recursive uninstall-recursive
|
||||
am__can_run_installinfo = \
|
||||
case $$AM_UPDATE_INFO_DIR in \
|
||||
n|no|NO) false;; \
|
||||
*) (install-info --version) >/dev/null 2>&1;; \
|
||||
esac
|
||||
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
|
||||
am__vpath_adj = case $$p in \
|
||||
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
|
||||
@@ -84,6 +150,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
|
||||
am__base_list = \
|
||||
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
|
||||
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
|
||||
am__uninstall_files_from_dir = { \
|
||||
test -z "$$files" \
|
||||
|| { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
|
||||
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
|
||||
$(am__cd) "$$dir" && rm -f $$files; }; \
|
||||
}
|
||||
man1dir = $(mandir)/man1
|
||||
am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pkgconfigdir)"
|
||||
NROFF = nroff
|
||||
@@ -91,18 +163,42 @@ MANS = $(dist_man_MANS)
|
||||
DATA = $(pkgconfig_DATA)
|
||||
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
|
||||
distclean-recursive maintainer-clean-recursive
|
||||
AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
|
||||
$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
|
||||
distdir dist dist-all distcheck
|
||||
am__recursive_targets = \
|
||||
$(RECURSIVE_TARGETS) \
|
||||
$(RECURSIVE_CLEAN_TARGETS) \
|
||||
$(am__extra_recursive_targets)
|
||||
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
|
||||
cscope distdir dist dist-all distcheck
|
||||
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
|
||||
# Read a list of newline-separated strings from the standard input,
|
||||
# and print each of them once, without duplicates. Input order is
|
||||
# *not* preserved.
|
||||
am__uniquify_input = $(AWK) '\
|
||||
BEGIN { nonempty = 0; } \
|
||||
{ items[$$0] = 1; nonempty = 1; } \
|
||||
END { if (nonempty) { for (i in items) print i; }; } \
|
||||
'
|
||||
# Make sure the list of sources is unique. This is necessary because,
|
||||
# e.g., the same source file might be shared among _SOURCES variables
|
||||
# for different programs/libraries.
|
||||
am__define_uniq_tagged_files = \
|
||||
list='$(am__tagged_files)'; \
|
||||
unique=`for i in $$list; do \
|
||||
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
||||
done | $(am__uniquify_input)`
|
||||
ETAGS = etags
|
||||
CTAGS = ctags
|
||||
CSCOPE = cscope
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
distdir = $(PACKAGE)-$(VERSION)
|
||||
top_distdir = $(distdir)
|
||||
am__remove_distdir = \
|
||||
{ test ! -d "$(distdir)" \
|
||||
|| { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
|
||||
&& rm -fr "$(distdir)"; }; }
|
||||
if test -d "$(distdir)"; then \
|
||||
find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
|
||||
&& rm -rf "$(distdir)" \
|
||||
|| { sleep 5 && rm -rf "$(distdir)"; }; \
|
||||
else :; fi
|
||||
am__post_remove_distdir = $(am__remove_distdir)
|
||||
am__relativize = \
|
||||
dir0=`pwd`; \
|
||||
sed_first='s,^\([^/]*\)/.*$$,\1,'; \
|
||||
@@ -130,9 +226,12 @@ am__relativize = \
|
||||
reldir="$$dir2"
|
||||
DIST_ARCHIVES = $(distdir).tar.gz
|
||||
GZIP_ENV = --best
|
||||
DIST_TARGETS = dist-gzip
|
||||
distuninstallcheck_listfiles = find . -type f -print
|
||||
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
|
||||
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
|
||||
distcleancheck_listfiles = find . -type f -print
|
||||
ACLOCAL = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run aclocal-1.11
|
||||
ACLOCAL = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing aclocal-1.14
|
||||
AIX_CFLAGS =
|
||||
AIX_LDFLAGS =
|
||||
AIX_LIBS =
|
||||
@@ -141,32 +240,33 @@ ALIB_LDFLAGS =
|
||||
ALIB_LIBS =
|
||||
ALSA_CFLAGS =
|
||||
ALSA_LDFLAGS =
|
||||
ALSA_LIBS =
|
||||
AMTAR = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run tar
|
||||
API_VERSION = 29
|
||||
AR = ar
|
||||
ALSA_LIBS = -lasound
|
||||
AMTAR = $${TAR-tar}
|
||||
AM_DEFAULT_VERBOSITY = 1
|
||||
API_VERSION = 38
|
||||
AR = arm-linux-androideabi-ar
|
||||
ARTS_CFLAGS =
|
||||
ARTS_LDFLAGS =
|
||||
ARTS_LIBS =
|
||||
AS = as
|
||||
AUTOCONF = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run autoconf
|
||||
AUTOHEADER = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run autoheader
|
||||
AUTOMAKE = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run automake-1.11
|
||||
AWK = gawk
|
||||
CC = gcc
|
||||
CCAS = gcc
|
||||
AUTOCONF = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing autoconf
|
||||
AUTOHEADER = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing autoheader
|
||||
AUTOMAKE = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing automake-1.14
|
||||
AWK = mawk
|
||||
CC = arm-linux-androideabi-gcc
|
||||
CCAS = arm-linux-androideabi-gcc
|
||||
CCASDEPMODE = depmode=gcc3
|
||||
CCASFLAGS = -g -O2
|
||||
CCDEPMODE = depmode=gcc3
|
||||
CFLAGS = -O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -g -O2
|
||||
COREAUDIO_CFLAGS =
|
||||
COREAUDIO_LDFLAGS =
|
||||
COREAUDIO_LIBS =
|
||||
CPP = gcc -E
|
||||
CPPFLAGS = -DOPT_GENERIC -DREAL_IS_FLOAT
|
||||
COREAUDIO_LIBS = -framework AudioToolbox -framework AudioUnit -framework CoreServices
|
||||
CPP = arm-linux-androideabi-gcc -E
|
||||
CPPFLAGS = -DOPT_ARM -DREAL_IS_FIXED
|
||||
CYGPATH_W = echo
|
||||
DECODER_LOBJ = stringbuf.lo icy.lo icy2utf8.lo ntom.lo synth.lo synth_8bit.lo layer1.lo layer2.lo layer3.lo synth_s32.lo synth_real.lo feature.lo
|
||||
DECODER_OBJ = stringbuf.$(OBJEXT) icy.$(OBJEXT) icy2utf8.$(OBJEXT) ntom.$(OBJEXT) synth.$(OBJEXT) synth_8bit.$(OBJEXT) layer1.$(OBJEXT) layer2.$(OBJEXT) layer3.$(OBJEXT) synth_s32.$(OBJEXT) synth_real.$(OBJEXT) feature.$(OBJEXT)
|
||||
DECODER_LOBJ = stringbuf.lo icy.lo icy2utf8.lo ntom.lo synth.lo synth_8bit.lo layer1.lo layer2.lo layer3.lo synth_arm.lo feature.lo
|
||||
DECODER_OBJ = stringbuf.$(OBJEXT) icy.$(OBJEXT) icy2utf8.$(OBJEXT) ntom.$(OBJEXT) synth.$(OBJEXT) synth_8bit.$(OBJEXT) layer1.$(OBJEXT) layer2.$(OBJEXT) layer3.$(OBJEXT) synth_arm.$(OBJEXT) feature.$(OBJEXT)
|
||||
DEFS = -DHAVE_CONFIG_H
|
||||
DEPDIR = .deps
|
||||
DLLTOOL = dlltool
|
||||
@@ -200,10 +300,10 @@ INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
|
||||
JACK_CFLAGS =
|
||||
JACK_LDFLAGS =
|
||||
JACK_LIBS =
|
||||
LD = /usr/bin/ld
|
||||
LD = /opt/android-ndk-r8e/ndk-standalone/arm-linux-androideabi/bin/ld
|
||||
LDFLAGS =
|
||||
LFS_LOBJ = lfs_wrap.lo lfs_alias.lo
|
||||
LIBMPG123_VERSION = 29:6:29
|
||||
LFS_LOBJ = lfs_alias.lo
|
||||
LIBMPG123_VERSION = 38:4:38
|
||||
LIBOBJS =
|
||||
LIBS = -lm
|
||||
LIBTOOL = $(SHELL) $(top_builddir)/libtool
|
||||
@@ -211,7 +311,7 @@ LIPO =
|
||||
LN_S = ln -s
|
||||
LTLIBOBJS =
|
||||
LT_LDFLAGS = -export-dynamic
|
||||
MAKEINFO = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run makeinfo
|
||||
MAKEINFO = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing makeinfo
|
||||
MANIFEST_TOOL = :
|
||||
MINT_CFLAGS =
|
||||
MINT_LDFLAGS =
|
||||
@@ -220,8 +320,8 @@ MKDIR_P = /bin/mkdir -p
|
||||
MODULE_OBJ = legacy_module.$(OBJEXT)
|
||||
NAS_CFLAGS =
|
||||
NAS_LDFLAGS =
|
||||
NAS_LIBS =
|
||||
NM = /usr/bin/nm -B
|
||||
NAS_LIBS = -laudio
|
||||
NM = /opt/android-ndk-r8e/ndk-standalone/bin/arm-linux-androideabi-nm -B
|
||||
NMEDIT =
|
||||
OBJDUMP = objdump
|
||||
OBJEXT = o
|
||||
@@ -230,7 +330,7 @@ OPENAL_LDFLAGS =
|
||||
OPENAL_LIBS =
|
||||
OS2_CFLAGS =
|
||||
OS2_LDFLAGS =
|
||||
OS2_LIBS =
|
||||
OS2_LIBS = -los2me -lmmpm2 -lsocket
|
||||
OSS_CFLAGS =
|
||||
OSS_LDFLAGS =
|
||||
OSS_LIBS =
|
||||
@@ -239,27 +339,30 @@ OTOOL64 =
|
||||
OUTPUT_CFLAGS =
|
||||
OUTPUT_LDFLAGS =
|
||||
OUTPUT_LIBS =
|
||||
OUTPUT_MOD = dummy
|
||||
OUTPUT_OBJ = output/dummy.$(OBJEXT)
|
||||
OUTPUT_MOD = oss
|
||||
OUTPUT_OBJ = output/oss.$(OBJEXT)
|
||||
PACKAGE = mpg123
|
||||
PACKAGE_BUGREPORT = mpg123-devel@lists.sourceforge.net
|
||||
PACKAGE_NAME = mpg123
|
||||
PACKAGE_STRING = mpg123 1.13.4
|
||||
PACKAGE_STRING = mpg123 1.17.0
|
||||
PACKAGE_TARNAME = mpg123
|
||||
PACKAGE_URL =
|
||||
PACKAGE_VERSION = 1.13.4
|
||||
PACKAGE_VERSION = 1.17.0
|
||||
PATH_SEPARATOR = :
|
||||
PKG_CONFIG = /usr/bin/pkg-config
|
||||
PORTAUDIO_CFLAGS =
|
||||
PORTAUDIO_LDFLAGS =
|
||||
PORTAUDIO_LIBS =
|
||||
PULSE_CFLAGS =
|
||||
PORTAUDIO_LIBS = -lportaudio
|
||||
PULSE_CFLAGS = -D_REENTRANT
|
||||
PULSE_LDFLAGS =
|
||||
PULSE_LIBS =
|
||||
RANLIB = ranlib
|
||||
SDL_CFLAGS =
|
||||
PULSE_LIBS = -lpulse-simple -lpulse
|
||||
QSA_CFLAGS =
|
||||
QSA_LDFLAGS =
|
||||
QSA_LIBS =
|
||||
RANLIB = arm-linux-androideabi-ranlib
|
||||
SDL_CFLAGS = -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/include/SDL
|
||||
SDL_LDFLAGS =
|
||||
SDL_LIBS =
|
||||
SDL_LIBS = -lSDL
|
||||
SED = /bin/sed
|
||||
SET_MAKE =
|
||||
SGI_CFLAGS =
|
||||
@@ -268,54 +371,63 @@ SGI_LIBS =
|
||||
SHELL = /bin/bash
|
||||
SNDIO_CFLAGS =
|
||||
SNDIO_LDFLAGS =
|
||||
SNDIO_LIBS =
|
||||
STRIP = strip
|
||||
SNDIO_LIBS = -lsndio
|
||||
STRIP = arm-linux-androideabi-strip
|
||||
SUN_CFLAGS =
|
||||
SUN_LDFLAGS =
|
||||
SUN_LIBS =
|
||||
VERSION = 1.13.4
|
||||
TINYALSA_CFLAGS =
|
||||
TINYALSA_LDFLAGS =
|
||||
TINYALSA_LIBS = -ltinyalsa
|
||||
VERSION = 1.17.0
|
||||
WIN32_CFLAGS =
|
||||
WIN32_LDFLAGS =
|
||||
WIN32_LIBS =
|
||||
abs_builddir = /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4
|
||||
abs_srcdir = /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4
|
||||
abs_top_builddir = /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4
|
||||
abs_top_srcdir = /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4
|
||||
ac_ct_AR = ar
|
||||
ac_ct_CC = gcc
|
||||
WIN32_LIBS = -lwinmm
|
||||
WIN32_WASAPI_CFLAGS =
|
||||
WIN32_WASAPI_LDFLAGS =
|
||||
WIN32_WASAPI_LIBS = -lole32 -lavrt
|
||||
YASM = yasm
|
||||
YASMFLAGS = -pgas -rgas -mamd64
|
||||
YASM_FORMAT =
|
||||
abs_builddir = /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0
|
||||
abs_srcdir = /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0
|
||||
abs_top_builddir = /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0
|
||||
abs_top_srcdir = /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0
|
||||
ac_ct_AR =
|
||||
ac_ct_CC =
|
||||
ac_ct_DUMPBIN =
|
||||
am__include = include
|
||||
am__leading_dot = .
|
||||
am__quote =
|
||||
am__tar = ${AMTAR} chof - "$$tardir"
|
||||
am__untar = ${AMTAR} xf -
|
||||
am__tar = $${TAR-tar} chof - "$$tardir"
|
||||
am__untar = $${TAR-tar} xf -
|
||||
bindir = ${exec_prefix}/bin
|
||||
build = i686-pc-linux-gnu
|
||||
build_alias =
|
||||
build_cpu = i686
|
||||
build = 86_64-unknown-linux-gnu
|
||||
build_alias = 86_64-unknown-linux-gnu
|
||||
build_cpu = 86_64
|
||||
build_os = linux-gnu
|
||||
build_vendor = pc
|
||||
build_vendor = unknown
|
||||
builddir = .
|
||||
datadir = ${datarootdir}
|
||||
datarootdir = ${prefix}/share
|
||||
docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
|
||||
dvidir = ${docdir}
|
||||
exec_prefix = ${prefix}
|
||||
host = i686-pc-linux-gnu
|
||||
host_alias =
|
||||
host_cpu = i686
|
||||
host_os = linux-gnu
|
||||
host_vendor = pc
|
||||
host = arm-unknown-linux-androideabi
|
||||
host_alias = arm-linux-androideabi
|
||||
host_cpu = arm
|
||||
host_os = linux-androideabi
|
||||
host_vendor = unknown
|
||||
htmldir = ${docdir}
|
||||
includedir = ${prefix}/include
|
||||
infodir = ${datarootdir}/info
|
||||
install_sh = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/install-sh
|
||||
install_sh = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/install-sh
|
||||
libdir = ${exec_prefix}/lib
|
||||
libexecdir = ${exec_prefix}/libexec
|
||||
localedir = ${datarootdir}/locale
|
||||
localstatedir = ${prefix}/var
|
||||
mandir = ${datarootdir}/man
|
||||
mkdir_p = /bin/mkdir -p
|
||||
mkdir_p = $(MKDIR_P)
|
||||
oldincludedir = /usr/include
|
||||
pdfdir = ${docdir}
|
||||
prefix = /usr/local
|
||||
@@ -325,7 +437,7 @@ sbindir = ${exec_prefix}/sbin
|
||||
sharedstatedir = ${prefix}/com
|
||||
srcdir = .
|
||||
sysconfdir = ${prefix}/etc
|
||||
target_alias =
|
||||
target_alias = arm-linux-androideabi
|
||||
top_build_prefix =
|
||||
top_builddir = .
|
||||
top_srcdir = .
|
||||
@@ -391,6 +503,14 @@ EXTRA_DIST = \
|
||||
ports/MSVC++/2008clr/examples/scanclr/scanclr.csproj \
|
||||
ports/MSVC++/2008clr/examples/scanclr/Program.cs \
|
||||
ports/MSVC++/2008clr/examples/scanclr/Properties/AssemblyInfo.cs \
|
||||
ports/MSVC++/2010/mpg123.sln \
|
||||
ports/MSVC++/2010/dump_seekindex/dump_seekindex.vcxproj \
|
||||
ports/MSVC++/2010/dump_seekindex/dump_seekindex.vcxproj.filters \
|
||||
ports/MSVC++/2010/feedseek/feedseek.vcxproj \
|
||||
ports/MSVC++/2010/feedseek/feedseek.vcxproj.filters \
|
||||
ports/MSVC++/2010/libmpg123/libmpg123.vcxproj \
|
||||
ports/MSVC++/2010/scan/scan.vcxproj \
|
||||
ports/MSVC++/2010/scan/scan.vcxproj.filters \
|
||||
ports/MSVC++/CMP3Stream/libMPG123/libMPG123.vcproj \
|
||||
ports/MSVC++/CMP3Stream/libMPG123/PLACE_LIBMPG123_SOURCES_HERE \
|
||||
ports/MSVC++/CMP3Stream/README \
|
||||
@@ -408,12 +528,18 @@ EXTRA_DIST = \
|
||||
ports/Sony_PSP/Makefile.psp \
|
||||
ports/Sony_PSP/readers.c.patch \
|
||||
ports/mpg123_.pas \
|
||||
scripts/benchmark-cpu.pl
|
||||
ports/Xcode/config.h \
|
||||
ports/Xcode/mpg123.h \
|
||||
ports/Xcode/mpg123.xcodeproj/project.pbxproj \
|
||||
scripts/benchmark-cpu.pl \
|
||||
scripts/tag_lyrics.py \
|
||||
scripts/conplay \
|
||||
scripts/mpg123info
|
||||
|
||||
all: all-recursive
|
||||
|
||||
.SUFFIXES:
|
||||
am--refresh:
|
||||
am--refresh: Makefile
|
||||
@:
|
||||
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
|
||||
@for dep in $?; do \
|
||||
@@ -462,11 +588,18 @@ distclean-libtool:
|
||||
-rm -f libtool config.lt
|
||||
install-man1: $(dist_man_MANS)
|
||||
@$(NORMAL_INSTALL)
|
||||
test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
|
||||
@list=''; test -n "$(man1dir)" || exit 0; \
|
||||
{ for i in $$list; do echo "$$i"; done; \
|
||||
l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
|
||||
sed -n '/\.1[a-z]*$$/p'; \
|
||||
@list1=''; \
|
||||
list2='$(dist_man_MANS)'; \
|
||||
test -n "$(man1dir)" \
|
||||
&& test -n "`echo $$list1$$list2`" \
|
||||
|| exit 0; \
|
||||
echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
|
||||
$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
|
||||
{ for i in $$list1; do echo "$$i"; done; \
|
||||
if test -n "$$list2"; then \
|
||||
for i in $$list2; do echo "$$i"; done \
|
||||
| sed -n '/\.1[a-z]*$$/p'; \
|
||||
fi; \
|
||||
} | while read p; do \
|
||||
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
|
||||
echo "$$d$$p"; echo "$$p"; \
|
||||
@@ -495,13 +628,14 @@ uninstall-man1:
|
||||
sed -n '/\.1[a-z]*$$/p'; \
|
||||
} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
|
||||
-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
|
||||
test -z "$$files" || { \
|
||||
echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
|
||||
cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
|
||||
dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
|
||||
install-pkgconfigDATA: $(pkgconfig_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
|
||||
@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
|
||||
if test -n "$$list"; then \
|
||||
echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
|
||||
$(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
|
||||
fi; \
|
||||
for p in $$list; do \
|
||||
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
echo "$$d$$p"; \
|
||||
@@ -515,27 +649,28 @@ uninstall-pkgconfigDATA:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
|
||||
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
|
||||
test -n "$$files" || exit 0; \
|
||||
echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
|
||||
cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
|
||||
dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
|
||||
|
||||
# This directory's subdirectories are mostly independent; you can cd
|
||||
# into them and run `make' without going through this Makefile.
|
||||
# To change the values of `make' variables: instead of editing Makefiles,
|
||||
# (1) if the variable is set in `config.status', edit `config.status'
|
||||
# (which will cause the Makefiles to be regenerated when you run `make');
|
||||
# (2) otherwise, pass the desired values on the `make' command line.
|
||||
$(RECURSIVE_TARGETS):
|
||||
@failcom='exit 1'; \
|
||||
for f in x $$MAKEFLAGS; do \
|
||||
case $$f in \
|
||||
*=* | --[!k]*);; \
|
||||
*k*) failcom='fail=yes';; \
|
||||
esac; \
|
||||
done; \
|
||||
# into them and run 'make' without going through this Makefile.
|
||||
# To change the values of 'make' variables: instead of editing Makefiles,
|
||||
# (1) if the variable is set in 'config.status', edit 'config.status'
|
||||
# (which will cause the Makefiles to be regenerated when you run 'make');
|
||||
# (2) otherwise, pass the desired values on the 'make' command line.
|
||||
$(am__recursive_targets):
|
||||
@fail=; \
|
||||
if $(am__make_keepgoing); then \
|
||||
failcom='fail=yes'; \
|
||||
else \
|
||||
failcom='exit 1'; \
|
||||
fi; \
|
||||
dot_seen=no; \
|
||||
target=`echo $@ | sed s/-recursive//`; \
|
||||
list='$(SUBDIRS)'; for subdir in $$list; do \
|
||||
case "$@" in \
|
||||
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
|
||||
*) list='$(SUBDIRS)' ;; \
|
||||
esac; \
|
||||
for subdir in $$list; do \
|
||||
echo "Making $$target in $$subdir"; \
|
||||
if test "$$subdir" = "."; then \
|
||||
dot_seen=yes; \
|
||||
@@ -550,57 +685,12 @@ $(RECURSIVE_TARGETS):
|
||||
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
|
||||
fi; test -z "$$fail"
|
||||
|
||||
$(RECURSIVE_CLEAN_TARGETS):
|
||||
@failcom='exit 1'; \
|
||||
for f in x $$MAKEFLAGS; do \
|
||||
case $$f in \
|
||||
*=* | --[!k]*);; \
|
||||
*k*) failcom='fail=yes';; \
|
||||
esac; \
|
||||
done; \
|
||||
dot_seen=no; \
|
||||
case "$@" in \
|
||||
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
|
||||
*) list='$(SUBDIRS)' ;; \
|
||||
esac; \
|
||||
rev=''; for subdir in $$list; do \
|
||||
if test "$$subdir" = "."; then :; else \
|
||||
rev="$$subdir $$rev"; \
|
||||
fi; \
|
||||
done; \
|
||||
rev="$$rev ."; \
|
||||
target=`echo $@ | sed s/-recursive//`; \
|
||||
for subdir in $$rev; do \
|
||||
echo "Making $$target in $$subdir"; \
|
||||
if test "$$subdir" = "."; then \
|
||||
local_target="$$target-am"; \
|
||||
else \
|
||||
local_target="$$target"; \
|
||||
fi; \
|
||||
($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|
||||
|| eval $$failcom; \
|
||||
done && test -z "$$fail"
|
||||
tags-recursive:
|
||||
list='$(SUBDIRS)'; for subdir in $$list; do \
|
||||
test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
|
||||
done
|
||||
ctags-recursive:
|
||||
list='$(SUBDIRS)'; for subdir in $$list; do \
|
||||
test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
|
||||
done
|
||||
ID: $(am__tagged_files)
|
||||
$(am__define_uniq_tagged_files); mkid -fID $$unique
|
||||
tags: tags-recursive
|
||||
TAGS: tags
|
||||
|
||||
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
||||
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
||||
unique=`for i in $$list; do \
|
||||
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
||||
done | \
|
||||
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
||||
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
||||
mkid -fID $$unique
|
||||
tags: TAGS
|
||||
|
||||
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
||||
$(TAGS_FILES) $(LISP)
|
||||
tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
|
||||
set x; \
|
||||
here=`pwd`; \
|
||||
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
|
||||
@@ -616,12 +706,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
||||
set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
|
||||
fi; \
|
||||
done; \
|
||||
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
||||
unique=`for i in $$list; do \
|
||||
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
||||
done | \
|
||||
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
||||
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
||||
$(am__define_uniq_tagged_files); \
|
||||
shift; \
|
||||
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
|
||||
test -n "$$unique" || unique=$$empty_fix; \
|
||||
@@ -633,15 +718,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
||||
$$unique; \
|
||||
fi; \
|
||||
fi
|
||||
ctags: CTAGS
|
||||
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
||||
$(TAGS_FILES) $(LISP)
|
||||
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
||||
unique=`for i in $$list; do \
|
||||
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
||||
done | \
|
||||
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
||||
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
||||
ctags: ctags-recursive
|
||||
|
||||
CTAGS: ctags
|
||||
ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
|
||||
$(am__define_uniq_tagged_files); \
|
||||
test -z "$(CTAGS_ARGS)$$unique" \
|
||||
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
||||
$$unique
|
||||
@@ -650,24 +731,33 @@ GTAGS:
|
||||
here=`$(am__cd) $(top_builddir) && pwd` \
|
||||
&& $(am__cd) $(top_srcdir) \
|
||||
&& gtags -i $(GTAGS_ARGS) "$$here"
|
||||
cscope: cscope.files
|
||||
test ! -s cscope.files \
|
||||
|| $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
|
||||
clean-cscope:
|
||||
-rm -f cscope.files
|
||||
cscope.files: clean-cscope cscopelist
|
||||
cscopelist: cscopelist-recursive
|
||||
|
||||
cscopelist-am: $(am__tagged_files)
|
||||
list='$(am__tagged_files)'; \
|
||||
case "$(srcdir)" in \
|
||||
[\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
|
||||
*) sdir=$(subdir)/$(srcdir) ;; \
|
||||
esac; \
|
||||
for i in $$list; do \
|
||||
if test -f "$$i"; then \
|
||||
echo "$(subdir)/$$i"; \
|
||||
else \
|
||||
echo "$$sdir/$$i"; \
|
||||
fi; \
|
||||
done >> $(top_builddir)/cscope.files
|
||||
|
||||
distclean-tags:
|
||||
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
||||
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
|
||||
|
||||
distdir: $(DISTFILES)
|
||||
@list='$(MANS)'; if test -n "$$list"; then \
|
||||
list=`for p in $$list; do \
|
||||
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
|
||||
if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
|
||||
if test -n "$$list" && \
|
||||
grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
|
||||
echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
|
||||
grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \
|
||||
echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \
|
||||
echo " typically \`make maintainer-clean' will remove them" >&2; \
|
||||
exit 1; \
|
||||
else :; fi; \
|
||||
else :; fi
|
||||
$(am__remove_distdir)
|
||||
test -d "$(distdir)" || mkdir "$(distdir)"
|
||||
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
||||
@@ -701,13 +791,10 @@ distdir: $(DISTFILES)
|
||||
done
|
||||
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
|
||||
if test "$$subdir" = .; then :; else \
|
||||
test -d "$(distdir)/$$subdir" \
|
||||
$(am__make_dryrun) \
|
||||
|| test -d "$(distdir)/$$subdir" \
|
||||
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|
||||
|| exit 1; \
|
||||
fi; \
|
||||
done
|
||||
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
|
||||
if test "$$subdir" = .; then :; else \
|
||||
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
|
||||
$(am__relativize); \
|
||||
new_distdir=$$reldir; \
|
||||
@@ -728,43 +815,50 @@ distdir: $(DISTFILES)
|
||||
fi; \
|
||||
done
|
||||
-test -n "$(am__skip_mode_fix)" \
|
||||
|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
|
||||
|| find "$(distdir)" -type d ! -perm -755 \
|
||||
-exec chmod u+rwx,go+rx {} \; -o \
|
||||
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
|
||||
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
|
||||
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|
||||
|| chmod -R a+r "$(distdir)"
|
||||
dist-gzip: distdir
|
||||
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
|
||||
$(am__remove_distdir)
|
||||
$(am__post_remove_distdir)
|
||||
|
||||
dist-bzip2: distdir
|
||||
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
|
||||
$(am__remove_distdir)
|
||||
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
|
||||
$(am__post_remove_distdir)
|
||||
|
||||
dist-lzma: distdir
|
||||
tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
|
||||
$(am__remove_distdir)
|
||||
dist-lzip: distdir
|
||||
tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
|
||||
$(am__post_remove_distdir)
|
||||
|
||||
dist-xz: distdir
|
||||
tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
|
||||
$(am__remove_distdir)
|
||||
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
|
||||
$(am__post_remove_distdir)
|
||||
|
||||
dist-tarZ: distdir
|
||||
@echo WARNING: "Support for shar distribution archives is" \
|
||||
"deprecated." >&2
|
||||
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
|
||||
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
|
||||
$(am__remove_distdir)
|
||||
$(am__post_remove_distdir)
|
||||
|
||||
dist-shar: distdir
|
||||
@echo WARNING: "Support for distribution archives compressed with" \
|
||||
"legacy program 'compress' is deprecated." >&2
|
||||
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
|
||||
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
|
||||
$(am__remove_distdir)
|
||||
$(am__post_remove_distdir)
|
||||
|
||||
dist-zip: distdir
|
||||
-rm -f $(distdir).zip
|
||||
zip -rq $(distdir).zip $(distdir)
|
||||
$(am__remove_distdir)
|
||||
$(am__post_remove_distdir)
|
||||
|
||||
dist dist-all: distdir
|
||||
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
|
||||
$(am__remove_distdir)
|
||||
dist dist-all:
|
||||
$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
|
||||
$(am__post_remove_distdir)
|
||||
|
||||
# This target untars the dist file and tries a VPATH configuration. Then
|
||||
# it guarantees that the distribution is self-contained by making another
|
||||
@@ -772,23 +866,23 @@ dist dist-all: distdir
|
||||
distcheck: dist
|
||||
case '$(DIST_ARCHIVES)' in \
|
||||
*.tar.gz*) \
|
||||
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
|
||||
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
|
||||
*.tar.bz2*) \
|
||||
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
|
||||
*.tar.lzma*) \
|
||||
unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
|
||||
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
|
||||
*.tar.lz*) \
|
||||
lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
|
||||
*.tar.xz*) \
|
||||
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
|
||||
*.tar.Z*) \
|
||||
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
|
||||
*.shar.gz*) \
|
||||
GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
|
||||
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
|
||||
*.zip*) \
|
||||
unzip $(distdir).zip ;;\
|
||||
esac
|
||||
chmod -R a-w $(distdir); chmod a+w $(distdir)
|
||||
mkdir $(distdir)/_build
|
||||
mkdir $(distdir)/_inst
|
||||
chmod -R a-w $(distdir)
|
||||
chmod u+w $(distdir)
|
||||
mkdir $(distdir)/_build $(distdir)/_inst
|
||||
chmod a-w $(distdir)
|
||||
test -d $(distdir)/_build || exit 0; \
|
||||
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
|
||||
@@ -796,6 +890,7 @@ distcheck: dist
|
||||
&& am__cwd=`pwd` \
|
||||
&& $(am__cd) $(distdir)/_build \
|
||||
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
|
||||
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
|
||||
$(DISTCHECK_CONFIGURE_FLAGS) \
|
||||
&& $(MAKE) $(AM_MAKEFLAGS) \
|
||||
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
|
||||
@@ -819,13 +914,21 @@ distcheck: dist
|
||||
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
|
||||
&& cd "$$am__cwd" \
|
||||
|| exit 1
|
||||
$(am__remove_distdir)
|
||||
$(am__post_remove_distdir)
|
||||
@(echo "$(distdir) archives ready for distribution: "; \
|
||||
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
|
||||
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
|
||||
distuninstallcheck:
|
||||
@$(am__cd) '$(distuninstallcheck_dir)' \
|
||||
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
|
||||
@test -n '$(distuninstallcheck_dir)' || { \
|
||||
echo 'ERROR: trying to run $@ with an empty' \
|
||||
'$$(distuninstallcheck_dir)' >&2; \
|
||||
exit 1; \
|
||||
}; \
|
||||
$(am__cd) '$(distuninstallcheck_dir)' || { \
|
||||
echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
|
||||
exit 1; \
|
||||
}; \
|
||||
test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
|
||||
|| { echo "ERROR: files left after uninstall:" ; \
|
||||
if test -n "$(DESTDIR)"; then \
|
||||
echo " (check DESTDIR support)"; \
|
||||
@@ -859,10 +962,15 @@ install-am: all-am
|
||||
|
||||
installcheck: installcheck-recursive
|
||||
install-strip:
|
||||
if test -z '$(STRIP)'; then \
|
||||
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
|
||||
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
|
||||
`test -z '$(STRIP)' || \
|
||||
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
|
||||
install; \
|
||||
else \
|
||||
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
|
||||
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
|
||||
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
|
||||
fi
|
||||
mostlyclean-generic:
|
||||
|
||||
clean-generic:
|
||||
@@ -946,25 +1054,24 @@ uninstall-am: uninstall-man uninstall-pkgconfigDATA
|
||||
|
||||
uninstall-man: uninstall-man1
|
||||
|
||||
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
|
||||
install-am install-strip tags-recursive
|
||||
.MAKE: $(am__recursive_targets) install-am install-strip
|
||||
|
||||
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
|
||||
all all-am am--refresh check check-am clean clean-generic \
|
||||
clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
|
||||
dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
|
||||
distcheck distclean distclean-generic distclean-libtool \
|
||||
distclean-tags distcleancheck distdir distuninstallcheck dvi \
|
||||
dvi-am html html-am info info-am install install-am \
|
||||
install-data install-data-am install-dvi install-dvi-am \
|
||||
install-exec install-exec-am install-html install-html-am \
|
||||
install-info install-info-am install-man install-man1 \
|
||||
install-pdf install-pdf-am install-pkgconfigDATA install-ps \
|
||||
install-ps-am install-strip installcheck installcheck-am \
|
||||
installdirs installdirs-am maintainer-clean \
|
||||
.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
|
||||
am--refresh check check-am clean clean-cscope clean-generic \
|
||||
clean-libtool cscope cscopelist-am ctags ctags-am dist \
|
||||
dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
|
||||
dist-xz dist-zip distcheck distclean distclean-generic \
|
||||
distclean-libtool distclean-tags distcleancheck distdir \
|
||||
distuninstallcheck dvi dvi-am html html-am info info-am \
|
||||
install install-am install-data install-data-am install-dvi \
|
||||
install-dvi-am install-exec install-exec-am install-html \
|
||||
install-html-am install-info install-info-am install-man \
|
||||
install-man1 install-pdf install-pdf-am install-pkgconfigDATA \
|
||||
install-ps install-ps-am install-strip installcheck \
|
||||
installcheck-am installdirs installdirs-am maintainer-clean \
|
||||
maintainer-clean-generic mostlyclean mostlyclean-generic \
|
||||
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
|
||||
uninstall uninstall-am uninstall-man uninstall-man1 \
|
||||
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
|
||||
uninstall-am uninstall-man uninstall-man1 \
|
||||
uninstall-pkgconfigDATA
|
||||
|
||||
|
||||
@@ -66,6 +66,14 @@ EXTRA_DIST = \
|
||||
ports/MSVC++/2008clr/examples/scanclr/scanclr.csproj \
|
||||
ports/MSVC++/2008clr/examples/scanclr/Program.cs \
|
||||
ports/MSVC++/2008clr/examples/scanclr/Properties/AssemblyInfo.cs \
|
||||
ports/MSVC++/2010/mpg123.sln \
|
||||
ports/MSVC++/2010/dump_seekindex/dump_seekindex.vcxproj \
|
||||
ports/MSVC++/2010/dump_seekindex/dump_seekindex.vcxproj.filters \
|
||||
ports/MSVC++/2010/feedseek/feedseek.vcxproj \
|
||||
ports/MSVC++/2010/feedseek/feedseek.vcxproj.filters \
|
||||
ports/MSVC++/2010/libmpg123/libmpg123.vcxproj \
|
||||
ports/MSVC++/2010/scan/scan.vcxproj \
|
||||
ports/MSVC++/2010/scan/scan.vcxproj.filters \
|
||||
ports/MSVC++/CMP3Stream/libMPG123/libMPG123.vcproj \
|
||||
ports/MSVC++/CMP3Stream/libMPG123/PLACE_LIBMPG123_SOURCES_HERE \
|
||||
ports/MSVC++/CMP3Stream/README \
|
||||
@@ -83,4 +91,10 @@ EXTRA_DIST = \
|
||||
ports/Sony_PSP/Makefile.psp \
|
||||
ports/Sony_PSP/readers.c.patch \
|
||||
ports/mpg123_.pas \
|
||||
scripts/benchmark-cpu.pl
|
||||
ports/Xcode/config.h \
|
||||
ports/Xcode/mpg123.h \
|
||||
ports/Xcode/mpg123.xcodeproj/project.pbxproj \
|
||||
scripts/benchmark-cpu.pl \
|
||||
scripts/tag_lyrics.py \
|
||||
scripts/conplay \
|
||||
scripts/mpg123info
|
||||
@@ -1,9 +1,8 @@
|
||||
# Makefile.in generated by automake 1.11 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.14 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
||||
# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
||||
# Inc.
|
||||
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
|
||||
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
@@ -16,6 +15,51 @@
|
||||
@SET_MAKE@
|
||||
|
||||
VPATH = @srcdir@
|
||||
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
|
||||
am__make_running_with_option = \
|
||||
case $${target_option-} in \
|
||||
?) ;; \
|
||||
*) echo "am__make_running_with_option: internal error: invalid" \
|
||||
"target option '$${target_option-}' specified" >&2; \
|
||||
exit 1;; \
|
||||
esac; \
|
||||
has_opt=no; \
|
||||
sane_makeflags=$$MAKEFLAGS; \
|
||||
if $(am__is_gnu_make); then \
|
||||
sane_makeflags=$$MFLAGS; \
|
||||
else \
|
||||
case $$MAKEFLAGS in \
|
||||
*\\[\ \ ]*) \
|
||||
bs=\\; \
|
||||
sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
|
||||
| sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
|
||||
esac; \
|
||||
fi; \
|
||||
skip_next=no; \
|
||||
strip_trailopt () \
|
||||
{ \
|
||||
flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
|
||||
}; \
|
||||
for flg in $$sane_makeflags; do \
|
||||
test $$skip_next = yes && { skip_next=no; continue; }; \
|
||||
case $$flg in \
|
||||
*=*|--*) continue;; \
|
||||
-*I) strip_trailopt 'I'; skip_next=yes;; \
|
||||
-*I?*) strip_trailopt 'I';; \
|
||||
-*O) strip_trailopt 'O'; skip_next=yes;; \
|
||||
-*O?*) strip_trailopt 'O';; \
|
||||
-*l) strip_trailopt 'l'; skip_next=yes;; \
|
||||
-*l?*) strip_trailopt 'l';; \
|
||||
-[dEDm]) skip_next=yes;; \
|
||||
-[JT]) skip_next=yes;; \
|
||||
esac; \
|
||||
case $$flg in \
|
||||
*$$target_option*) has_opt=yes; break;; \
|
||||
esac; \
|
||||
done; \
|
||||
test $$has_opt = yes
|
||||
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
|
||||
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
|
||||
pkgdatadir = $(datadir)/@PACKAGE@
|
||||
pkgincludedir = $(includedir)/@PACKAGE@
|
||||
pkglibdir = $(libdir)/@PACKAGE@
|
||||
@@ -35,12 +79,16 @@ POST_UNINSTALL = :
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
subdir = .
|
||||
DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
|
||||
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
|
||||
DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
|
||||
$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
|
||||
$(top_srcdir)/configure $(am__configure_deps) \
|
||||
$(srcdir)/libmpg123.pc.in $(srcdir)/mpg123.spec.in \
|
||||
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
|
||||
TODO build/config.guess build/config.sub build/depcomp \
|
||||
build/install-sh build/ltmain.sh build/missing
|
||||
$(dist_man_MANS) COPYING TODO build/compile build/config.guess \
|
||||
build/config.sub build/depcomp build/install-sh build/missing \
|
||||
build/ltmain.sh $(top_srcdir)/build/compile \
|
||||
$(top_srcdir)/build/config.guess \
|
||||
$(top_srcdir)/build/config.sub $(top_srcdir)/build/install-sh \
|
||||
$(top_srcdir)/build/ltmain.sh $(top_srcdir)/build/missing
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/m4/addrconfig.m4 \
|
||||
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
|
||||
@@ -54,15 +102,33 @@ mkinstalldirs = $(install_sh) -d
|
||||
CONFIG_HEADER = $(top_builddir)/src/config.h
|
||||
CONFIG_CLEAN_FILES = libmpg123.pc mpg123.spec
|
||||
CONFIG_CLEAN_VPATH_FILES =
|
||||
AM_V_P = $(am__v_P_@AM_V@)
|
||||
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
|
||||
am__v_P_0 = false
|
||||
am__v_P_1 = :
|
||||
AM_V_GEN = $(am__v_GEN_@AM_V@)
|
||||
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
|
||||
am__v_GEN_0 = @echo " GEN " $@;
|
||||
am__v_GEN_1 =
|
||||
AM_V_at = $(am__v_at_@AM_V@)
|
||||
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
|
||||
am__v_at_0 = @
|
||||
am__v_at_1 =
|
||||
SOURCES =
|
||||
DIST_SOURCES =
|
||||
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
|
||||
html-recursive info-recursive install-data-recursive \
|
||||
install-dvi-recursive install-exec-recursive \
|
||||
install-html-recursive install-info-recursive \
|
||||
install-pdf-recursive install-ps-recursive install-recursive \
|
||||
installcheck-recursive installdirs-recursive pdf-recursive \
|
||||
ps-recursive uninstall-recursive
|
||||
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
|
||||
ctags-recursive dvi-recursive html-recursive info-recursive \
|
||||
install-data-recursive install-dvi-recursive \
|
||||
install-exec-recursive install-html-recursive \
|
||||
install-info-recursive install-pdf-recursive \
|
||||
install-ps-recursive install-recursive installcheck-recursive \
|
||||
installdirs-recursive pdf-recursive ps-recursive \
|
||||
tags-recursive uninstall-recursive
|
||||
am__can_run_installinfo = \
|
||||
case $$AM_UPDATE_INFO_DIR in \
|
||||
n|no|NO) false;; \
|
||||
*) (install-info --version) >/dev/null 2>&1;; \
|
||||
esac
|
||||
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
|
||||
am__vpath_adj = case $$p in \
|
||||
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
|
||||
@@ -84,6 +150,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
|
||||
am__base_list = \
|
||||
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
|
||||
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
|
||||
am__uninstall_files_from_dir = { \
|
||||
test -z "$$files" \
|
||||
|| { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
|
||||
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
|
||||
$(am__cd) "$$dir" && rm -f $$files; }; \
|
||||
}
|
||||
man1dir = $(mandir)/man1
|
||||
am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pkgconfigdir)"
|
||||
NROFF = nroff
|
||||
@@ -91,18 +163,42 @@ MANS = $(dist_man_MANS)
|
||||
DATA = $(pkgconfig_DATA)
|
||||
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
|
||||
distclean-recursive maintainer-clean-recursive
|
||||
AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
|
||||
$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
|
||||
distdir dist dist-all distcheck
|
||||
am__recursive_targets = \
|
||||
$(RECURSIVE_TARGETS) \
|
||||
$(RECURSIVE_CLEAN_TARGETS) \
|
||||
$(am__extra_recursive_targets)
|
||||
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
|
||||
cscope distdir dist dist-all distcheck
|
||||
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
|
||||
# Read a list of newline-separated strings from the standard input,
|
||||
# and print each of them once, without duplicates. Input order is
|
||||
# *not* preserved.
|
||||
am__uniquify_input = $(AWK) '\
|
||||
BEGIN { nonempty = 0; } \
|
||||
{ items[$$0] = 1; nonempty = 1; } \
|
||||
END { if (nonempty) { for (i in items) print i; }; } \
|
||||
'
|
||||
# Make sure the list of sources is unique. This is necessary because,
|
||||
# e.g., the same source file might be shared among _SOURCES variables
|
||||
# for different programs/libraries.
|
||||
am__define_uniq_tagged_files = \
|
||||
list='$(am__tagged_files)'; \
|
||||
unique=`for i in $$list; do \
|
||||
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
||||
done | $(am__uniquify_input)`
|
||||
ETAGS = etags
|
||||
CTAGS = ctags
|
||||
CSCOPE = cscope
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
distdir = $(PACKAGE)-$(VERSION)
|
||||
top_distdir = $(distdir)
|
||||
am__remove_distdir = \
|
||||
{ test ! -d "$(distdir)" \
|
||||
|| { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
|
||||
&& rm -fr "$(distdir)"; }; }
|
||||
if test -d "$(distdir)"; then \
|
||||
find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
|
||||
&& rm -rf "$(distdir)" \
|
||||
|| { sleep 5 && rm -rf "$(distdir)"; }; \
|
||||
else :; fi
|
||||
am__post_remove_distdir = $(am__remove_distdir)
|
||||
am__relativize = \
|
||||
dir0=`pwd`; \
|
||||
sed_first='s,^\([^/]*\)/.*$$,\1,'; \
|
||||
@@ -130,7 +226,10 @@ am__relativize = \
|
||||
reldir="$$dir2"
|
||||
DIST_ARCHIVES = $(distdir).tar.gz
|
||||
GZIP_ENV = --best
|
||||
DIST_TARGETS = dist-gzip
|
||||
distuninstallcheck_listfiles = find . -type f -print
|
||||
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
|
||||
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
|
||||
distcleancheck_listfiles = find . -type f -print
|
||||
ACLOCAL = @ACLOCAL@
|
||||
AIX_CFLAGS = @AIX_CFLAGS@
|
||||
@@ -143,6 +242,7 @@ ALSA_CFLAGS = @ALSA_CFLAGS@
|
||||
ALSA_LDFLAGS = @ALSA_LDFLAGS@
|
||||
ALSA_LIBS = @ALSA_LIBS@
|
||||
AMTAR = @AMTAR@
|
||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||
API_VERSION = @API_VERSION@
|
||||
AR = @AR@
|
||||
ARTS_CFLAGS = @ARTS_CFLAGS@
|
||||
@@ -256,6 +356,9 @@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
|
||||
PULSE_CFLAGS = @PULSE_CFLAGS@
|
||||
PULSE_LDFLAGS = @PULSE_LDFLAGS@
|
||||
PULSE_LIBS = @PULSE_LIBS@
|
||||
QSA_CFLAGS = @QSA_CFLAGS@
|
||||
QSA_LDFLAGS = @QSA_LDFLAGS@
|
||||
QSA_LIBS = @QSA_LIBS@
|
||||
RANLIB = @RANLIB@
|
||||
SDL_CFLAGS = @SDL_CFLAGS@
|
||||
SDL_LDFLAGS = @SDL_LDFLAGS@
|
||||
@@ -273,10 +376,19 @@ STRIP = @STRIP@
|
||||
SUN_CFLAGS = @SUN_CFLAGS@
|
||||
SUN_LDFLAGS = @SUN_LDFLAGS@
|
||||
SUN_LIBS = @SUN_LIBS@
|
||||
TINYALSA_CFLAGS = @TINYALSA_CFLAGS@
|
||||
TINYALSA_LDFLAGS = @TINYALSA_LDFLAGS@
|
||||
TINYALSA_LIBS = @TINYALSA_LIBS@
|
||||
VERSION = @VERSION@
|
||||
WIN32_CFLAGS = @WIN32_CFLAGS@
|
||||
WIN32_LDFLAGS = @WIN32_LDFLAGS@
|
||||
WIN32_LIBS = @WIN32_LIBS@
|
||||
WIN32_WASAPI_CFLAGS = @WIN32_WASAPI_CFLAGS@
|
||||
WIN32_WASAPI_LDFLAGS = @WIN32_WASAPI_LDFLAGS@
|
||||
WIN32_WASAPI_LIBS = @WIN32_WASAPI_LIBS@
|
||||
YASM = @YASM@
|
||||
YASMFLAGS = @YASMFLAGS@
|
||||
YASM_FORMAT = @YASM_FORMAT@
|
||||
abs_builddir = @abs_builddir@
|
||||
abs_srcdir = @abs_srcdir@
|
||||
abs_top_builddir = @abs_top_builddir@
|
||||
@@ -391,6 +503,14 @@ EXTRA_DIST = \
|
||||
ports/MSVC++/2008clr/examples/scanclr/scanclr.csproj \
|
||||
ports/MSVC++/2008clr/examples/scanclr/Program.cs \
|
||||
ports/MSVC++/2008clr/examples/scanclr/Properties/AssemblyInfo.cs \
|
||||
ports/MSVC++/2010/mpg123.sln \
|
||||
ports/MSVC++/2010/dump_seekindex/dump_seekindex.vcxproj \
|
||||
ports/MSVC++/2010/dump_seekindex/dump_seekindex.vcxproj.filters \
|
||||
ports/MSVC++/2010/feedseek/feedseek.vcxproj \
|
||||
ports/MSVC++/2010/feedseek/feedseek.vcxproj.filters \
|
||||
ports/MSVC++/2010/libmpg123/libmpg123.vcxproj \
|
||||
ports/MSVC++/2010/scan/scan.vcxproj \
|
||||
ports/MSVC++/2010/scan/scan.vcxproj.filters \
|
||||
ports/MSVC++/CMP3Stream/libMPG123/libMPG123.vcproj \
|
||||
ports/MSVC++/CMP3Stream/libMPG123/PLACE_LIBMPG123_SOURCES_HERE \
|
||||
ports/MSVC++/CMP3Stream/README \
|
||||
@@ -408,12 +528,18 @@ EXTRA_DIST = \
|
||||
ports/Sony_PSP/Makefile.psp \
|
||||
ports/Sony_PSP/readers.c.patch \
|
||||
ports/mpg123_.pas \
|
||||
scripts/benchmark-cpu.pl
|
||||
ports/Xcode/config.h \
|
||||
ports/Xcode/mpg123.h \
|
||||
ports/Xcode/mpg123.xcodeproj/project.pbxproj \
|
||||
scripts/benchmark-cpu.pl \
|
||||
scripts/tag_lyrics.py \
|
||||
scripts/conplay \
|
||||
scripts/mpg123info
|
||||
|
||||
all: all-recursive
|
||||
|
||||
.SUFFIXES:
|
||||
am--refresh:
|
||||
am--refresh: Makefile
|
||||
@:
|
||||
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
|
||||
@for dep in $?; do \
|
||||
@@ -462,11 +588,18 @@ distclean-libtool:
|
||||
-rm -f libtool config.lt
|
||||
install-man1: $(dist_man_MANS)
|
||||
@$(NORMAL_INSTALL)
|
||||
test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
|
||||
@list=''; test -n "$(man1dir)" || exit 0; \
|
||||
{ for i in $$list; do echo "$$i"; done; \
|
||||
l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
|
||||
sed -n '/\.1[a-z]*$$/p'; \
|
||||
@list1=''; \
|
||||
list2='$(dist_man_MANS)'; \
|
||||
test -n "$(man1dir)" \
|
||||
&& test -n "`echo $$list1$$list2`" \
|
||||
|| exit 0; \
|
||||
echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
|
||||
$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
|
||||
{ for i in $$list1; do echo "$$i"; done; \
|
||||
if test -n "$$list2"; then \
|
||||
for i in $$list2; do echo "$$i"; done \
|
||||
| sed -n '/\.1[a-z]*$$/p'; \
|
||||
fi; \
|
||||
} | while read p; do \
|
||||
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
|
||||
echo "$$d$$p"; echo "$$p"; \
|
||||
@@ -495,13 +628,14 @@ uninstall-man1:
|
||||
sed -n '/\.1[a-z]*$$/p'; \
|
||||
} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
|
||||
-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
|
||||
test -z "$$files" || { \
|
||||
echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
|
||||
cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
|
||||
dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
|
||||
install-pkgconfigDATA: $(pkgconfig_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
|
||||
@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
|
||||
if test -n "$$list"; then \
|
||||
echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
|
||||
$(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
|
||||
fi; \
|
||||
for p in $$list; do \
|
||||
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
echo "$$d$$p"; \
|
||||
@@ -515,27 +649,28 @@ uninstall-pkgconfigDATA:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
|
||||
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
|
||||
test -n "$$files" || exit 0; \
|
||||
echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
|
||||
cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
|
||||
dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
|
||||
|
||||
# This directory's subdirectories are mostly independent; you can cd
|
||||
# into them and run `make' without going through this Makefile.
|
||||
# To change the values of `make' variables: instead of editing Makefiles,
|
||||
# (1) if the variable is set in `config.status', edit `config.status'
|
||||
# (which will cause the Makefiles to be regenerated when you run `make');
|
||||
# (2) otherwise, pass the desired values on the `make' command line.
|
||||
$(RECURSIVE_TARGETS):
|
||||
@failcom='exit 1'; \
|
||||
for f in x $$MAKEFLAGS; do \
|
||||
case $$f in \
|
||||
*=* | --[!k]*);; \
|
||||
*k*) failcom='fail=yes';; \
|
||||
esac; \
|
||||
done; \
|
||||
# into them and run 'make' without going through this Makefile.
|
||||
# To change the values of 'make' variables: instead of editing Makefiles,
|
||||
# (1) if the variable is set in 'config.status', edit 'config.status'
|
||||
# (which will cause the Makefiles to be regenerated when you run 'make');
|
||||
# (2) otherwise, pass the desired values on the 'make' command line.
|
||||
$(am__recursive_targets):
|
||||
@fail=; \
|
||||
if $(am__make_keepgoing); then \
|
||||
failcom='fail=yes'; \
|
||||
else \
|
||||
failcom='exit 1'; \
|
||||
fi; \
|
||||
dot_seen=no; \
|
||||
target=`echo $@ | sed s/-recursive//`; \
|
||||
list='$(SUBDIRS)'; for subdir in $$list; do \
|
||||
case "$@" in \
|
||||
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
|
||||
*) list='$(SUBDIRS)' ;; \
|
||||
esac; \
|
||||
for subdir in $$list; do \
|
||||
echo "Making $$target in $$subdir"; \
|
||||
if test "$$subdir" = "."; then \
|
||||
dot_seen=yes; \
|
||||
@@ -550,57 +685,12 @@ $(RECURSIVE_TARGETS):
|
||||
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
|
||||
fi; test -z "$$fail"
|
||||
|
||||
$(RECURSIVE_CLEAN_TARGETS):
|
||||
@failcom='exit 1'; \
|
||||
for f in x $$MAKEFLAGS; do \
|
||||
case $$f in \
|
||||
*=* | --[!k]*);; \
|
||||
*k*) failcom='fail=yes';; \
|
||||
esac; \
|
||||
done; \
|
||||
dot_seen=no; \
|
||||
case "$@" in \
|
||||
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
|
||||
*) list='$(SUBDIRS)' ;; \
|
||||
esac; \
|
||||
rev=''; for subdir in $$list; do \
|
||||
if test "$$subdir" = "."; then :; else \
|
||||
rev="$$subdir $$rev"; \
|
||||
fi; \
|
||||
done; \
|
||||
rev="$$rev ."; \
|
||||
target=`echo $@ | sed s/-recursive//`; \
|
||||
for subdir in $$rev; do \
|
||||
echo "Making $$target in $$subdir"; \
|
||||
if test "$$subdir" = "."; then \
|
||||
local_target="$$target-am"; \
|
||||
else \
|
||||
local_target="$$target"; \
|
||||
fi; \
|
||||
($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|
||||
|| eval $$failcom; \
|
||||
done && test -z "$$fail"
|
||||
tags-recursive:
|
||||
list='$(SUBDIRS)'; for subdir in $$list; do \
|
||||
test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
|
||||
done
|
||||
ctags-recursive:
|
||||
list='$(SUBDIRS)'; for subdir in $$list; do \
|
||||
test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
|
||||
done
|
||||
ID: $(am__tagged_files)
|
||||
$(am__define_uniq_tagged_files); mkid -fID $$unique
|
||||
tags: tags-recursive
|
||||
TAGS: tags
|
||||
|
||||
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
||||
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
||||
unique=`for i in $$list; do \
|
||||
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
||||
done | \
|
||||
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
||||
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
||||
mkid -fID $$unique
|
||||
tags: TAGS
|
||||
|
||||
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
||||
$(TAGS_FILES) $(LISP)
|
||||
tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
|
||||
set x; \
|
||||
here=`pwd`; \
|
||||
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
|
||||
@@ -616,12 +706,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
||||
set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
|
||||
fi; \
|
||||
done; \
|
||||
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
||||
unique=`for i in $$list; do \
|
||||
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
||||
done | \
|
||||
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
||||
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
||||
$(am__define_uniq_tagged_files); \
|
||||
shift; \
|
||||
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
|
||||
test -n "$$unique" || unique=$$empty_fix; \
|
||||
@@ -633,15 +718,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
||||
$$unique; \
|
||||
fi; \
|
||||
fi
|
||||
ctags: CTAGS
|
||||
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
||||
$(TAGS_FILES) $(LISP)
|
||||
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
||||
unique=`for i in $$list; do \
|
||||
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
||||
done | \
|
||||
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
||||
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
||||
ctags: ctags-recursive
|
||||
|
||||
CTAGS: ctags
|
||||
ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
|
||||
$(am__define_uniq_tagged_files); \
|
||||
test -z "$(CTAGS_ARGS)$$unique" \
|
||||
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
||||
$$unique
|
||||
@@ -650,24 +731,33 @@ GTAGS:
|
||||
here=`$(am__cd) $(top_builddir) && pwd` \
|
||||
&& $(am__cd) $(top_srcdir) \
|
||||
&& gtags -i $(GTAGS_ARGS) "$$here"
|
||||
cscope: cscope.files
|
||||
test ! -s cscope.files \
|
||||
|| $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
|
||||
clean-cscope:
|
||||
-rm -f cscope.files
|
||||
cscope.files: clean-cscope cscopelist
|
||||
cscopelist: cscopelist-recursive
|
||||
|
||||
cscopelist-am: $(am__tagged_files)
|
||||
list='$(am__tagged_files)'; \
|
||||
case "$(srcdir)" in \
|
||||
[\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
|
||||
*) sdir=$(subdir)/$(srcdir) ;; \
|
||||
esac; \
|
||||
for i in $$list; do \
|
||||
if test -f "$$i"; then \
|
||||
echo "$(subdir)/$$i"; \
|
||||
else \
|
||||
echo "$$sdir/$$i"; \
|
||||
fi; \
|
||||
done >> $(top_builddir)/cscope.files
|
||||
|
||||
distclean-tags:
|
||||
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
|
||||
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
|
||||
|
||||
distdir: $(DISTFILES)
|
||||
@list='$(MANS)'; if test -n "$$list"; then \
|
||||
list=`for p in $$list; do \
|
||||
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
|
||||
if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
|
||||
if test -n "$$list" && \
|
||||
grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
|
||||
echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
|
||||
grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \
|
||||
echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \
|
||||
echo " typically \`make maintainer-clean' will remove them" >&2; \
|
||||
exit 1; \
|
||||
else :; fi; \
|
||||
else :; fi
|
||||
$(am__remove_distdir)
|
||||
test -d "$(distdir)" || mkdir "$(distdir)"
|
||||
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
||||
@@ -701,13 +791,10 @@ distdir: $(DISTFILES)
|
||||
done
|
||||
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
|
||||
if test "$$subdir" = .; then :; else \
|
||||
test -d "$(distdir)/$$subdir" \
|
||||
$(am__make_dryrun) \
|
||||
|| test -d "$(distdir)/$$subdir" \
|
||||
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|
||||
|| exit 1; \
|
||||
fi; \
|
||||
done
|
||||
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
|
||||
if test "$$subdir" = .; then :; else \
|
||||
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
|
||||
$(am__relativize); \
|
||||
new_distdir=$$reldir; \
|
||||
@@ -728,43 +815,50 @@ distdir: $(DISTFILES)
|
||||
fi; \
|
||||
done
|
||||
-test -n "$(am__skip_mode_fix)" \
|
||||
|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
|
||||
|| find "$(distdir)" -type d ! -perm -755 \
|
||||
-exec chmod u+rwx,go+rx {} \; -o \
|
||||
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
|
||||
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
|
||||
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|
||||
|| chmod -R a+r "$(distdir)"
|
||||
dist-gzip: distdir
|
||||
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
|
||||
$(am__remove_distdir)
|
||||
$(am__post_remove_distdir)
|
||||
|
||||
dist-bzip2: distdir
|
||||
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
|
||||
$(am__remove_distdir)
|
||||
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
|
||||
$(am__post_remove_distdir)
|
||||
|
||||
dist-lzma: distdir
|
||||
tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
|
||||
$(am__remove_distdir)
|
||||
dist-lzip: distdir
|
||||
tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
|
||||
$(am__post_remove_distdir)
|
||||
|
||||
dist-xz: distdir
|
||||
tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
|
||||
$(am__remove_distdir)
|
||||
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
|
||||
$(am__post_remove_distdir)
|
||||
|
||||
dist-tarZ: distdir
|
||||
@echo WARNING: "Support for shar distribution archives is" \
|
||||
"deprecated." >&2
|
||||
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
|
||||
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
|
||||
$(am__remove_distdir)
|
||||
$(am__post_remove_distdir)
|
||||
|
||||
dist-shar: distdir
|
||||
@echo WARNING: "Support for distribution archives compressed with" \
|
||||
"legacy program 'compress' is deprecated." >&2
|
||||
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
|
||||
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
|
||||
$(am__remove_distdir)
|
||||
$(am__post_remove_distdir)
|
||||
|
||||
dist-zip: distdir
|
||||
-rm -f $(distdir).zip
|
||||
zip -rq $(distdir).zip $(distdir)
|
||||
$(am__remove_distdir)
|
||||
$(am__post_remove_distdir)
|
||||
|
||||
dist dist-all: distdir
|
||||
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
|
||||
$(am__remove_distdir)
|
||||
dist dist-all:
|
||||
$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
|
||||
$(am__post_remove_distdir)
|
||||
|
||||
# This target untars the dist file and tries a VPATH configuration. Then
|
||||
# it guarantees that the distribution is self-contained by making another
|
||||
@@ -772,23 +866,23 @@ dist dist-all: distdir
|
||||
distcheck: dist
|
||||
case '$(DIST_ARCHIVES)' in \
|
||||
*.tar.gz*) \
|
||||
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
|
||||
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
|
||||
*.tar.bz2*) \
|
||||
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
|
||||
*.tar.lzma*) \
|
||||
unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
|
||||
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
|
||||
*.tar.lz*) \
|
||||
lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
|
||||
*.tar.xz*) \
|
||||
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
|
||||
*.tar.Z*) \
|
||||
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
|
||||
*.shar.gz*) \
|
||||
GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
|
||||
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
|
||||
*.zip*) \
|
||||
unzip $(distdir).zip ;;\
|
||||
esac
|
||||
chmod -R a-w $(distdir); chmod a+w $(distdir)
|
||||
mkdir $(distdir)/_build
|
||||
mkdir $(distdir)/_inst
|
||||
chmod -R a-w $(distdir)
|
||||
chmod u+w $(distdir)
|
||||
mkdir $(distdir)/_build $(distdir)/_inst
|
||||
chmod a-w $(distdir)
|
||||
test -d $(distdir)/_build || exit 0; \
|
||||
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
|
||||
@@ -796,6 +890,7 @@ distcheck: dist
|
||||
&& am__cwd=`pwd` \
|
||||
&& $(am__cd) $(distdir)/_build \
|
||||
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
|
||||
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
|
||||
$(DISTCHECK_CONFIGURE_FLAGS) \
|
||||
&& $(MAKE) $(AM_MAKEFLAGS) \
|
||||
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
|
||||
@@ -819,13 +914,21 @@ distcheck: dist
|
||||
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
|
||||
&& cd "$$am__cwd" \
|
||||
|| exit 1
|
||||
$(am__remove_distdir)
|
||||
$(am__post_remove_distdir)
|
||||
@(echo "$(distdir) archives ready for distribution: "; \
|
||||
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
|
||||
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
|
||||
distuninstallcheck:
|
||||
@$(am__cd) '$(distuninstallcheck_dir)' \
|
||||
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
|
||||
@test -n '$(distuninstallcheck_dir)' || { \
|
||||
echo 'ERROR: trying to run $@ with an empty' \
|
||||
'$$(distuninstallcheck_dir)' >&2; \
|
||||
exit 1; \
|
||||
}; \
|
||||
$(am__cd) '$(distuninstallcheck_dir)' || { \
|
||||
echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
|
||||
exit 1; \
|
||||
}; \
|
||||
test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
|
||||
|| { echo "ERROR: files left after uninstall:" ; \
|
||||
if test -n "$(DESTDIR)"; then \
|
||||
echo " (check DESTDIR support)"; \
|
||||
@@ -859,10 +962,15 @@ install-am: all-am
|
||||
|
||||
installcheck: installcheck-recursive
|
||||
install-strip:
|
||||
if test -z '$(STRIP)'; then \
|
||||
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
|
||||
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
|
||||
`test -z '$(STRIP)' || \
|
||||
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
|
||||
install; \
|
||||
else \
|
||||
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
|
||||
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
|
||||
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
|
||||
fi
|
||||
mostlyclean-generic:
|
||||
|
||||
clean-generic:
|
||||
@@ -946,25 +1054,24 @@ uninstall-am: uninstall-man uninstall-pkgconfigDATA
|
||||
|
||||
uninstall-man: uninstall-man1
|
||||
|
||||
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
|
||||
install-am install-strip tags-recursive
|
||||
.MAKE: $(am__recursive_targets) install-am install-strip
|
||||
|
||||
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
|
||||
all all-am am--refresh check check-am clean clean-generic \
|
||||
clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
|
||||
dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
|
||||
distcheck distclean distclean-generic distclean-libtool \
|
||||
distclean-tags distcleancheck distdir distuninstallcheck dvi \
|
||||
dvi-am html html-am info info-am install install-am \
|
||||
install-data install-data-am install-dvi install-dvi-am \
|
||||
install-exec install-exec-am install-html install-html-am \
|
||||
install-info install-info-am install-man install-man1 \
|
||||
install-pdf install-pdf-am install-pkgconfigDATA install-ps \
|
||||
install-ps-am install-strip installcheck installcheck-am \
|
||||
installdirs installdirs-am maintainer-clean \
|
||||
.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
|
||||
am--refresh check check-am clean clean-cscope clean-generic \
|
||||
clean-libtool cscope cscopelist-am ctags ctags-am dist \
|
||||
dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
|
||||
dist-xz dist-zip distcheck distclean distclean-generic \
|
||||
distclean-libtool distclean-tags distcleancheck distdir \
|
||||
distuninstallcheck dvi dvi-am html html-am info info-am \
|
||||
install install-am install-data install-data-am install-dvi \
|
||||
install-dvi-am install-exec install-exec-am install-html \
|
||||
install-html-am install-info install-info-am install-man \
|
||||
install-man1 install-pdf install-pdf-am install-pkgconfigDATA \
|
||||
install-ps install-ps-am install-strip installcheck \
|
||||
installcheck-am installdirs installdirs-am maintainer-clean \
|
||||
maintainer-clean-generic mostlyclean mostlyclean-generic \
|
||||
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
|
||||
uninstall uninstall-am uninstall-man uninstall-man1 \
|
||||
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
|
||||
uninstall-am uninstall-man uninstall-man1 \
|
||||
uninstall-pkgconfigDATA
|
||||
|
||||
|
||||
@@ -1,3 +1,150 @@
|
||||
1.17.0
|
||||
---
|
||||
- mpg123-id3dump --no-scan; for speedup
|
||||
- hide -C parameter from mpg123 --help when it is not supported
|
||||
- added tinyalsa Output (by Jarno Lehtinen)
|
||||
- build system tweaking
|
||||
- some care for fixing Cygwin builds
|
||||
|
||||
1.16.0
|
||||
---
|
||||
- Taihei strikes again:
|
||||
- New Huffman decoding scheme (configurable, on by default) brings nice boost to mpg123 to make it the fastest decoder on modern CPUs again.
|
||||
- new AVX decoder
|
||||
- assembly-optimized DCT36 for SSE and AVX
|
||||
- added configs for vintage 3DNow(ext) CPUs (AMD K6) utilizing assembly DCT36
|
||||
- added configs for vintage SSE CPUs (Pentium M), utilizing C DCT36
|
||||
- added FORMAT command to generic control
|
||||
- added support for ID3v2 APIC frames
|
||||
- added mpg123-id3dump as official companion to extract meta data
|
||||
(including writing of album art from APIC to files)
|
||||
- added mpg123-strip as official companion to strip dirt out of MPEG streams
|
||||
(including meta data)
|
||||
- not deleting ID3 data right after printing in generic control
|
||||
- module loader a bit more flexible with relative MPG123_MODDIR
|
||||
- Fix chopped-off playback with pulseaudio output: draining the output now on closing.
|
||||
- SDL output fixup, a) not chopping off end and b) non-fatal underrun
|
||||
- Fix obvious errors in win32 output ... does it now play the end of tracks? Need someone to test this.
|
||||
- added support for screen and iris-ansi terminals with --title (as prompted by patch from sf.net user canavan)
|
||||
- fixes/enhancements for sgi audio output
|
||||
- libmpg123: proper largefile aliases for proper systems (FreeBSD with one one-and-only off_t
|
||||
This enables client software that insists on defining pointless _FILE_OFFSET_BITS.
|
||||
- wrapper script src/mpg123-with-modules to ease the pain of running mpg123 with modules without installation (setting MPG123_MODDIR)
|
||||
- removed ALSA 0.5 code (unused for longtime, last GPL-only bit)
|
||||
|
||||
1.15.4
|
||||
---
|
||||
- Writing CDDA data via --cdr works again; had also been broken by attempts to catch failing writes because of full disk.
|
||||
- Also, the return values of WAV/CDR writing routines now properly indicate error to avoid stupid endless loop of "smart" audio writing code that wants to handle interruptions. Really, --cdr could just go and nobody would miss it ...
|
||||
- Fix stupid bug in mpg123_chomp_string() (introduced in 1.15.1), empty lines were badly treated. Only usage in mpg123 is for parsing HTTP redirect headers; malicious HTTP servers might exploit that (possibility to zero bytes in memory).
|
||||
- some cleanup for nagging mode
|
||||
- more resync strictness to really catch (all) cases with changing decoder structure; in practice badly needed when disabling seekbuffer (so it's your fault, somehow ...) for non-seekable streams, otherwise not really an issue because of readahead checking
|
||||
I repeat: This fixes possibly fatal behaviour in the parser when readahead checking is explicitly disabled (p.ex. via mpg123 --no-seekbuffer on http streams). By default, readahead checking is _always_ active!
|
||||
- build system fixed for automake 1.13 (thanks to Nix)
|
||||
|
||||
1.15.3
|
||||
---
|
||||
- Fix WAV writing. AGAIN. People love to decode WAV to stdout in various ways that started to get broken with me starting to care for people who like to write to full disks. I frikkin' HATE this rat race! I'm even starting to SHOUT. Now, the code prefers to write no header at all (when there is no actual output) instead of possibly writing too many misleading ones. Getting the blame for breaking dir2ogg repeatedly while trying to cope with one fatal situation that you cannot really cope with sucks. Big time. I hope that's it now!
|
||||
|
||||
1.15.2
|
||||
---
|
||||
- build fix with older shells (== in configure)
|
||||
|
||||
1.15.1
|
||||
---
|
||||
- libmpg123 API version 37
|
||||
- Fix corner case in HTTP communication with missing path in Location header (bug 187).
|
||||
- Prevent nasty alignment issues by not guessing about assembler alignment when .balign is available (bug 188).
|
||||
|
||||
1.15.0
|
||||
---
|
||||
- Added --continue (also see scripts/conplay).
|
||||
- Added number row to terminal control keys for 10% jump points (for navigating long tracks).
|
||||
- Set xterm title always if asked, disregarding the -q switch (if you want fully quiet, don't specify --title).
|
||||
- Enable terminal mode in OS/2 by explicitly checking for and using os2term library.
|
||||
- Getting WAV/AU/CDR writing back to a sane state while still catching out-of-disk when writing headers (none in case of CDR) but removing that initial test that prevented writing on any non-seekable file (like, /dev/stdout to a pipe).
|
||||
- Added native audio output for QNX (thanks to Mike Gorchak), also improving portability of configure script while at that.
|
||||
- more robust recovery from ALSA issues (device suspend)
|
||||
- Fix crash in module loader on *BSD.
|
||||
- Extend time display to switch to hours above 60 minutes (hh:mm:ss, ditching the sub-second precision)
|
||||
- really include dithering in default x86-64 build.
|
||||
- Fix mpg123_scan() not properly seeking back for all types of files (bug 3582628 ... it got a different number on sf.net now ... brilliant, folks!).
|
||||
- Prevent false positives for "Frankenstein!" when using mpg123_scan().
|
||||
- Fix printing of negative positions with buffer (bug 186).
|
||||
- Accept application/x-scpls as additional MIME type.
|
||||
- Try to handle certain Windows toolchains that miss EOVERFLOW.
|
||||
|
||||
1.14.4
|
||||
---
|
||||
|
||||
Who reworks a parsing and data mangling without really making sure that things still work like before? I hope I won't do so in future. Not again.
|
||||
|
||||
- Fix resync logic to properly work again (used to prematurely end stream on bad headers). A regression again, this sucks, but at least we got a regression test for that now.
|
||||
- Fix aeon-old regression (since 1.11.0) about short seeks: Bit reservoir was reset also for short seeks that did not break continuity.
|
||||
- Another damned regression got fixed: Sample-accurate seek for files without full gapless info.
|
||||
|
||||
1.14.3
|
||||
---
|
||||
- Fix regression from 1.14.1 in parsing of bad free format streams, avoiding apparently endless loops (just very slow reading, in fact).
|
||||
|
||||
1.14.2
|
||||
---
|
||||
- Fix writing of WAV to stdout.
|
||||
It is still not the best of ideas to do so, though. At least make sure to fix rate and channels.
|
||||
|
||||
1.14.1
|
||||
---
|
||||
- Fix subtle bug that could trigger failure to detect a format change on resync when using libmpg123's feeder API.
|
||||
That bug has been there since ages but was neutralized by other (buggy) behaviour of the parser before the little overhaul. The Law of an Even Number of Bugs.
|
||||
|
||||
1.14.0
|
||||
---
|
||||
- libmpg123 API version 36 (see NEWS.libmpg123)
|
||||
- Add --ignore-streamlength.
|
||||
- But also deal with concatenated (Frankenstein) streams: Not applying gapless cutting once we're over the announced number of frames.
|
||||
- Also, gapless cutting is only applied if relevant information is present. Previously, at least the decoder delay has been cut.
|
||||
- Add --lyrics for printout of lyrics (from USLT in ID3v2).
|
||||
- Added handling of SIGUSR1 and SIGUSER2 to terminal control code, configurable via --ctrlusr1 and --ctrlusr2.
|
||||
- Some low-level API added (mpg123_framedata(), mpg123_framepos(), buffering and resampling control).
|
||||
- Added info about input buffer fill to mpg123_getstate().
|
||||
- ReplayGain: Try to detect LAME below 3.95 for the different reference level of 83 dB (adding preamp of 6 dB). Version 3.95 itself (not 3.95.1) I cannot detect. User-set gain values are not touched.
|
||||
- Keep silent about missing bit reservoir when ignoring frames. That is the whole point (mostly;-).
|
||||
- Add the new/old WRITE_SAMPLE variant from MPlayer that makes the generic decoder faster on older CPUs (x86 at least). Not on x86-64, though (it's not enabled per default there).
|
||||
- disable 3DNow and 3DNowExt DCT36, which is slow on modern CPUs
|
||||
- Handle out-of-disk in the file writers (a bit, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=67259)
|
||||
- Added Xcode project files to build libmpg123 on Mac OS and iOS
|
||||
- 32 bit output for sndio output (patch by Brad Smith).
|
||||
- Remote control interface knows LOADLIST command now.
|
||||
- Now freeing meta data memory after printout.
|
||||
- Some documentation cleanup, including manpage fixes by quadrispro.
|
||||
- Re-enabled wildcard expansion on Windows (been broken by unicode file name support).
|
||||
- Fix MMX tabinit syntax (thanks to Marcel Müller for pointing that out).
|
||||
- Fix SGI audio output (been broken since change to modules).
|
||||
- Fix some fringe behaviour (mpg123_getformat() triggering needless reading of next frame, possibly hitting bogus MPG123_NEED_MORE).
|
||||
- Resync limit now also serves to increase amount of skipped junk on beginning.
|
||||
- Better separation of stream end and read error (in case there is no stream opened, even).
|
||||
- Don't always complain about failed free format header search (only with verbosity level 3).
|
||||
|
||||
1.13.8
|
||||
---
|
||||
- Fix build for ARM Thumb (incompatible assembly in some macros).
|
||||
|
||||
1.13.7
|
||||
---
|
||||
- Fix endless loop in module loader when starting mpg123 in a directory that does not exist.
|
||||
|
||||
1.13.6
|
||||
---
|
||||
- Fix output of one random character in -vvv mode for ID3v2.2 frames (no buffer overflow, move along, folks;-).
|
||||
|
||||
1.13.5
|
||||
---
|
||||
- Fix reading of ReplayGain values from Lame tag (nobody seen this before?!)
|
||||
(both actual values and the distinction between audiophile / radio).
|
||||
- Accept application/octet-stream as input from HTTP.
|
||||
- Update man page with encodings.
|
||||
- Build fixes.
|
||||
|
||||
1.13.4
|
||||
---
|
||||
- Fix bogus error on resync with big offsets (hits systems that have bigger off_t than int), bug 3393801.
|
||||
@@ -1,5 +1,34 @@
|
||||
Changes in libmpg123 libtool interface versions...
|
||||
|
||||
38.0.38
|
||||
- Added MPG123_PICTURE and associated addition to mpg123_id3v2 struct.
|
||||
|
||||
37.0.37
|
||||
- Added mpg123_chomp_string.
|
||||
|
||||
36.0.36
|
||||
- Extended MPG123_RESYNC_LIMIT to initial header search.
|
||||
- Not cutting decoder delay unconditionally anymore (only in combination with known encoder delay / padding).
|
||||
|
||||
35.0.35
|
||||
- Added mpg123_meta_free().
|
||||
|
||||
34.0.34
|
||||
- Added flag MPG123_AUTO_RESAMPLE.
|
||||
- Changed (improved;-) outbuffer behaviour.
|
||||
|
||||
33.0.33
|
||||
- Added MPG123_BUFFERFILL.
|
||||
|
||||
32.0.32
|
||||
- Added mpg123_framepos()
|
||||
|
||||
31.0.31
|
||||
- Added mpg123_framedata() and MPG123_IGNORE_INFOFRAME.
|
||||
|
||||
30.0.30
|
||||
- Added MPG123_FEEDPOOL and MPG123_FEEDBUFFER.
|
||||
|
||||
29.0.29
|
||||
- New decoder: ARM neon.
|
||||
- Added support for 24 bit output (dumb byte-chopping of 32 bit output).
|
||||
@@ -1,5 +1,7 @@
|
||||
Things that need to be done...
|
||||
|
||||
... as always, mostly outdated.
|
||||
|
||||
0. Fix that ugly crash that happens sometimes when Ctrl+C-ing with jack output active:
|
||||
|
||||
Program terminated with signal 11, Segmentation fault.
|
||||
+387
-203
File diff suppressed because it is too large
Load Diff
Executable
+347
@@ -0,0 +1,347 @@
|
||||
#! /bin/sh
|
||||
# Wrapper for compilers which do not understand '-c -o'.
|
||||
|
||||
scriptversion=2012-10-14.11; # UTC
|
||||
|
||||
# Copyright (C) 1999-2013 Free Software Foundation, Inc.
|
||||
# Written by Tom Tromey <tromey@cygnus.com>.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2, or (at your option)
|
||||
# any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# As a special exception to the GNU General Public License, if you
|
||||
# distribute this file as part of a program that contains a
|
||||
# configuration script generated by Autoconf, you may include it under
|
||||
# the same distribution terms that you use for the rest of that program.
|
||||
|
||||
# This file is maintained in Automake, please report
|
||||
# bugs to <bug-automake@gnu.org> or send patches to
|
||||
# <automake-patches@gnu.org>.
|
||||
|
||||
nl='
|
||||
'
|
||||
|
||||
# We need space, tab and new line, in precisely that order. Quoting is
|
||||
# there to prevent tools from complaining about whitespace usage.
|
||||
IFS=" "" $nl"
|
||||
|
||||
file_conv=
|
||||
|
||||
# func_file_conv build_file lazy
|
||||
# Convert a $build file to $host form and store it in $file
|
||||
# Currently only supports Windows hosts. If the determined conversion
|
||||
# type is listed in (the comma separated) LAZY, no conversion will
|
||||
# take place.
|
||||
func_file_conv ()
|
||||
{
|
||||
file=$1
|
||||
case $file in
|
||||
/ | /[!/]*) # absolute file, and not a UNC file
|
||||
if test -z "$file_conv"; then
|
||||
# lazily determine how to convert abs files
|
||||
case `uname -s` in
|
||||
MINGW*)
|
||||
file_conv=mingw
|
||||
;;
|
||||
CYGWIN*)
|
||||
file_conv=cygwin
|
||||
;;
|
||||
*)
|
||||
file_conv=wine
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
case $file_conv/,$2, in
|
||||
*,$file_conv,*)
|
||||
;;
|
||||
mingw/*)
|
||||
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
|
||||
;;
|
||||
cygwin/*)
|
||||
file=`cygpath -m "$file" || echo "$file"`
|
||||
;;
|
||||
wine/*)
|
||||
file=`winepath -w "$file" || echo "$file"`
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
# func_cl_dashL linkdir
|
||||
# Make cl look for libraries in LINKDIR
|
||||
func_cl_dashL ()
|
||||
{
|
||||
func_file_conv "$1"
|
||||
if test -z "$lib_path"; then
|
||||
lib_path=$file
|
||||
else
|
||||
lib_path="$lib_path;$file"
|
||||
fi
|
||||
linker_opts="$linker_opts -LIBPATH:$file"
|
||||
}
|
||||
|
||||
# func_cl_dashl library
|
||||
# Do a library search-path lookup for cl
|
||||
func_cl_dashl ()
|
||||
{
|
||||
lib=$1
|
||||
found=no
|
||||
save_IFS=$IFS
|
||||
IFS=';'
|
||||
for dir in $lib_path $LIB
|
||||
do
|
||||
IFS=$save_IFS
|
||||
if $shared && test -f "$dir/$lib.dll.lib"; then
|
||||
found=yes
|
||||
lib=$dir/$lib.dll.lib
|
||||
break
|
||||
fi
|
||||
if test -f "$dir/$lib.lib"; then
|
||||
found=yes
|
||||
lib=$dir/$lib.lib
|
||||
break
|
||||
fi
|
||||
if test -f "$dir/lib$lib.a"; then
|
||||
found=yes
|
||||
lib=$dir/lib$lib.a
|
||||
break
|
||||
fi
|
||||
done
|
||||
IFS=$save_IFS
|
||||
|
||||
if test "$found" != yes; then
|
||||
lib=$lib.lib
|
||||
fi
|
||||
}
|
||||
|
||||
# func_cl_wrapper cl arg...
|
||||
# Adjust compile command to suit cl
|
||||
func_cl_wrapper ()
|
||||
{
|
||||
# Assume a capable shell
|
||||
lib_path=
|
||||
shared=:
|
||||
linker_opts=
|
||||
for arg
|
||||
do
|
||||
if test -n "$eat"; then
|
||||
eat=
|
||||
else
|
||||
case $1 in
|
||||
-o)
|
||||
# configure might choose to run compile as 'compile cc -o foo foo.c'.
|
||||
eat=1
|
||||
case $2 in
|
||||
*.o | *.[oO][bB][jJ])
|
||||
func_file_conv "$2"
|
||||
set x "$@" -Fo"$file"
|
||||
shift
|
||||
;;
|
||||
*)
|
||||
func_file_conv "$2"
|
||||
set x "$@" -Fe"$file"
|
||||
shift
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
-I)
|
||||
eat=1
|
||||
func_file_conv "$2" mingw
|
||||
set x "$@" -I"$file"
|
||||
shift
|
||||
;;
|
||||
-I*)
|
||||
func_file_conv "${1#-I}" mingw
|
||||
set x "$@" -I"$file"
|
||||
shift
|
||||
;;
|
||||
-l)
|
||||
eat=1
|
||||
func_cl_dashl "$2"
|
||||
set x "$@" "$lib"
|
||||
shift
|
||||
;;
|
||||
-l*)
|
||||
func_cl_dashl "${1#-l}"
|
||||
set x "$@" "$lib"
|
||||
shift
|
||||
;;
|
||||
-L)
|
||||
eat=1
|
||||
func_cl_dashL "$2"
|
||||
;;
|
||||
-L*)
|
||||
func_cl_dashL "${1#-L}"
|
||||
;;
|
||||
-static)
|
||||
shared=false
|
||||
;;
|
||||
-Wl,*)
|
||||
arg=${1#-Wl,}
|
||||
save_ifs="$IFS"; IFS=','
|
||||
for flag in $arg; do
|
||||
IFS="$save_ifs"
|
||||
linker_opts="$linker_opts $flag"
|
||||
done
|
||||
IFS="$save_ifs"
|
||||
;;
|
||||
-Xlinker)
|
||||
eat=1
|
||||
linker_opts="$linker_opts $2"
|
||||
;;
|
||||
-*)
|
||||
set x "$@" "$1"
|
||||
shift
|
||||
;;
|
||||
*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
|
||||
func_file_conv "$1"
|
||||
set x "$@" -Tp"$file"
|
||||
shift
|
||||
;;
|
||||
*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
|
||||
func_file_conv "$1" mingw
|
||||
set x "$@" "$file"
|
||||
shift
|
||||
;;
|
||||
*)
|
||||
set x "$@" "$1"
|
||||
shift
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
shift
|
||||
done
|
||||
if test -n "$linker_opts"; then
|
||||
linker_opts="-link$linker_opts"
|
||||
fi
|
||||
exec "$@" $linker_opts
|
||||
exit 1
|
||||
}
|
||||
|
||||
eat=
|
||||
|
||||
case $1 in
|
||||
'')
|
||||
echo "$0: No command. Try '$0 --help' for more information." 1>&2
|
||||
exit 1;
|
||||
;;
|
||||
-h | --h*)
|
||||
cat <<\EOF
|
||||
Usage: compile [--help] [--version] PROGRAM [ARGS]
|
||||
|
||||
Wrapper for compilers which do not understand '-c -o'.
|
||||
Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
|
||||
arguments, and rename the output as expected.
|
||||
|
||||
If you are trying to build a whole package this is not the
|
||||
right script to run: please start by reading the file 'INSTALL'.
|
||||
|
||||
Report bugs to <bug-automake@gnu.org>.
|
||||
EOF
|
||||
exit $?
|
||||
;;
|
||||
-v | --v*)
|
||||
echo "compile $scriptversion"
|
||||
exit $?
|
||||
;;
|
||||
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
|
||||
func_cl_wrapper "$@" # Doesn't return...
|
||||
;;
|
||||
esac
|
||||
|
||||
ofile=
|
||||
cfile=
|
||||
|
||||
for arg
|
||||
do
|
||||
if test -n "$eat"; then
|
||||
eat=
|
||||
else
|
||||
case $1 in
|
||||
-o)
|
||||
# configure might choose to run compile as 'compile cc -o foo foo.c'.
|
||||
# So we strip '-o arg' only if arg is an object.
|
||||
eat=1
|
||||
case $2 in
|
||||
*.o | *.obj)
|
||||
ofile=$2
|
||||
;;
|
||||
*)
|
||||
set x "$@" -o "$2"
|
||||
shift
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
*.c)
|
||||
cfile=$1
|
||||
set x "$@" "$1"
|
||||
shift
|
||||
;;
|
||||
*)
|
||||
set x "$@" "$1"
|
||||
shift
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
shift
|
||||
done
|
||||
|
||||
if test -z "$ofile" || test -z "$cfile"; then
|
||||
# If no '-o' option was seen then we might have been invoked from a
|
||||
# pattern rule where we don't need one. That is ok -- this is a
|
||||
# normal compilation that the losing compiler can handle. If no
|
||||
# '.c' file was seen then we are probably linking. That is also
|
||||
# ok.
|
||||
exec "$@"
|
||||
fi
|
||||
|
||||
# Name of file we expect compiler to create.
|
||||
cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
|
||||
|
||||
# Create the lock directory.
|
||||
# Note: use '[/\\:.-]' here to ensure that we don't use the same name
|
||||
# that we are using for the .o file. Also, base the name on the expected
|
||||
# object file name, since that is what matters with a parallel build.
|
||||
lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
|
||||
while true; do
|
||||
if mkdir "$lockdir" >/dev/null 2>&1; then
|
||||
break
|
||||
fi
|
||||
sleep 1
|
||||
done
|
||||
# FIXME: race condition here if user kills between mkdir and trap.
|
||||
trap "rmdir '$lockdir'; exit 1" 1 2 15
|
||||
|
||||
# Run the compile.
|
||||
"$@"
|
||||
ret=$?
|
||||
|
||||
if test -f "$cofile"; then
|
||||
test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
|
||||
elif test -f "${cofile}bj"; then
|
||||
test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
|
||||
fi
|
||||
|
||||
rmdir "$lockdir"
|
||||
exit $ret
|
||||
|
||||
# Local Variables:
|
||||
# mode: shell-script
|
||||
# sh-indentation: 2
|
||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
||||
# time-stamp-start: "scriptversion="
|
||||
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
||||
# time-stamp-time-zone: "UTC"
|
||||
# time-stamp-end: "; # UTC"
|
||||
# End:
|
||||
+199
-202
@@ -1,14 +1,12 @@
|
||||
#! /bin/sh
|
||||
# Attempt to guess a canonical system name.
|
||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
|
||||
# Free Software Foundation, Inc.
|
||||
# Copyright 1992-2013 Free Software Foundation, Inc.
|
||||
|
||||
timestamp='2009-04-27'
|
||||
timestamp='2013-06-10'
|
||||
|
||||
# This file is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# the Free Software Foundation; either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful, but
|
||||
@@ -17,26 +15,22 @@ timestamp='2009-04-27'
|
||||
# General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
|
||||
# 02110-1301, USA.
|
||||
# along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
# As a special exception to the GNU General Public License, if you
|
||||
# distribute this file as part of a program that contains a
|
||||
# configuration script generated by Autoconf, you may include it under
|
||||
# the same distribution terms that you use for the rest of that program.
|
||||
|
||||
|
||||
# Originally written by Per Bothner <per@bothner.com>.
|
||||
# Please send patches to <config-patches@gnu.org>. Submit a context
|
||||
# diff and a properly formatted ChangeLog entry.
|
||||
# the same distribution terms that you use for the rest of that
|
||||
# program. This Exception is an additional permission under section 7
|
||||
# of the GNU General Public License, version 3 ("GPLv3").
|
||||
#
|
||||
# This script attempts to guess a canonical system name similar to
|
||||
# config.sub. If it succeeds, it prints the system name on stdout, and
|
||||
# exits with 0. Otherwise, it exits with 1.
|
||||
# Originally written by Per Bothner.
|
||||
#
|
||||
# The plan is that this can be called by configure scripts if you
|
||||
# don't specify an explicit build system type.
|
||||
# You can get the latest version of this script from:
|
||||
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
|
||||
#
|
||||
# Please send patches with a ChangeLog entry to config-patches@gnu.org.
|
||||
|
||||
|
||||
me=`echo "$0" | sed -e 's,.*/,,'`
|
||||
|
||||
@@ -56,8 +50,7 @@ version="\
|
||||
GNU config.guess ($timestamp)
|
||||
|
||||
Originally written by Per Bothner.
|
||||
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
|
||||
2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
||||
Copyright 1992-2013 Free Software Foundation, Inc.
|
||||
|
||||
This is free software; see the source for copying conditions. There is NO
|
||||
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
||||
@@ -139,12 +132,33 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
|
||||
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
|
||||
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
|
||||
|
||||
case "${UNAME_SYSTEM}" in
|
||||
Linux|GNU|GNU/*)
|
||||
# If the system lacks a compiler, then just pick glibc.
|
||||
# We could probably try harder.
|
||||
LIBC=gnu
|
||||
|
||||
eval $set_cc_for_build
|
||||
cat <<-EOF > $dummy.c
|
||||
#include <features.h>
|
||||
#if defined(__UCLIBC__)
|
||||
LIBC=uclibc
|
||||
#elif defined(__dietlibc__)
|
||||
LIBC=dietlibc
|
||||
#else
|
||||
LIBC=gnu
|
||||
#endif
|
||||
EOF
|
||||
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
|
||||
;;
|
||||
esac
|
||||
|
||||
# Note: order is significant - the case branches are not exclusive.
|
||||
|
||||
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
||||
*:NetBSD:*:*)
|
||||
# NetBSD (nbsd) targets should (where applicable) match one or
|
||||
# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
|
||||
# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
|
||||
# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
|
||||
# switched to ELF, *-*-netbsd* would select the old
|
||||
# object file format. This provides both forward
|
||||
@@ -170,7 +184,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
||||
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
|
||||
eval $set_cc_for_build
|
||||
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
|
||||
| grep __ELF__ >/dev/null
|
||||
| grep -q __ELF__
|
||||
then
|
||||
# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
|
||||
# Return netbsd for either. FIX?
|
||||
@@ -201,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
||||
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
|
||||
echo "${machine}-${os}${release}"
|
||||
exit ;;
|
||||
*:Bitrig:*:*)
|
||||
UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
|
||||
echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
|
||||
exit ;;
|
||||
*:OpenBSD:*:*)
|
||||
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
|
||||
echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
|
||||
@@ -269,7 +287,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
||||
# A Xn.n version is an unreleased experimental baselevel.
|
||||
# 1.2 uses "1.2" for uname -r.
|
||||
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
|
||||
exit ;;
|
||||
# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
|
||||
exitcode=$?
|
||||
trap '' 0
|
||||
exit $exitcode ;;
|
||||
Alpha\ *:Windows_NT*:*)
|
||||
# How do we know it's Interix rather than the generic POSIX subsystem?
|
||||
# Should we change UNAME_MACHINE based on the output of uname instead
|
||||
@@ -300,7 +321,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
||||
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
|
||||
echo arm-acorn-riscix${UNAME_RELEASE}
|
||||
exit ;;
|
||||
arm:riscos:*:*|arm:RISCOS:*:*)
|
||||
arm*:riscos:*:*|arm*:RISCOS:*:*)
|
||||
echo arm-unknown-riscos
|
||||
exit ;;
|
||||
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
|
||||
@@ -333,6 +354,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
||||
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
|
||||
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
||||
exit ;;
|
||||
i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
|
||||
echo i386-pc-auroraux${UNAME_RELEASE}
|
||||
exit ;;
|
||||
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
|
||||
eval $set_cc_for_build
|
||||
SUN_ARCH="i386"
|
||||
@@ -548,7 +572,7 @@ EOF
|
||||
echo rs6000-ibm-aix3.2
|
||||
fi
|
||||
exit ;;
|
||||
*:AIX:*:[456])
|
||||
*:AIX:*:[4567])
|
||||
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
|
||||
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
|
||||
IBM_ARCH=rs6000
|
||||
@@ -656,7 +680,7 @@ EOF
|
||||
# => hppa64-hp-hpux11.23
|
||||
|
||||
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
|
||||
grep __LP64__ >/dev/null
|
||||
grep -q __LP64__
|
||||
then
|
||||
HP_ARCH="hppa2.0w"
|
||||
else
|
||||
@@ -785,21 +809,26 @@ EOF
|
||||
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
|
||||
exit ;;
|
||||
*:FreeBSD:*:*)
|
||||
case ${UNAME_MACHINE} in
|
||||
pc98)
|
||||
echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
|
||||
UNAME_PROCESSOR=`/usr/bin/uname -p`
|
||||
case ${UNAME_PROCESSOR} in
|
||||
amd64)
|
||||
echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
|
||||
*)
|
||||
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
|
||||
echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
|
||||
esac
|
||||
exit ;;
|
||||
i*:CYGWIN*:*)
|
||||
echo ${UNAME_MACHINE}-pc-cygwin
|
||||
exit ;;
|
||||
*:MINGW64*:*)
|
||||
echo ${UNAME_MACHINE}-pc-mingw64
|
||||
exit ;;
|
||||
*:MINGW*:*)
|
||||
echo ${UNAME_MACHINE}-pc-mingw32
|
||||
exit ;;
|
||||
i*:MSYS*:*)
|
||||
echo ${UNAME_MACHINE}-pc-msys
|
||||
exit ;;
|
||||
i*:windows32*:*)
|
||||
# uname -m includes "-pc" on this system.
|
||||
echo ${UNAME_MACHINE}-mingw32
|
||||
@@ -807,12 +836,12 @@ EOF
|
||||
i*:PW*:*)
|
||||
echo ${UNAME_MACHINE}-pc-pw32
|
||||
exit ;;
|
||||
*:Interix*:[3456]*)
|
||||
*:Interix*:*)
|
||||
case ${UNAME_MACHINE} in
|
||||
x86)
|
||||
echo i586-pc-interix${UNAME_RELEASE}
|
||||
exit ;;
|
||||
EM64T | authenticamd | genuineintel)
|
||||
authenticamd | genuineintel | EM64T)
|
||||
echo x86_64-unknown-interix${UNAME_RELEASE}
|
||||
exit ;;
|
||||
IA64)
|
||||
@@ -822,6 +851,9 @@ EOF
|
||||
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
|
||||
echo i${UNAME_MACHINE}-pc-mks
|
||||
exit ;;
|
||||
8664:Windows_NT:*)
|
||||
echo x86_64-pc-mks
|
||||
exit ;;
|
||||
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
|
||||
# How do we know it's Interix rather than the generic POSIX subsystem?
|
||||
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
|
||||
@@ -842,100 +874,21 @@ EOF
|
||||
exit ;;
|
||||
*:GNU:*:*)
|
||||
# the GNU system
|
||||
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
|
||||
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
|
||||
exit ;;
|
||||
*:GNU/*:*:*)
|
||||
# other systems with GNU libc and userland
|
||||
echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
|
||||
echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
|
||||
exit ;;
|
||||
i*86:Minix:*:*)
|
||||
echo ${UNAME_MACHINE}-pc-minix
|
||||
exit ;;
|
||||
arm*:Linux:*:*)
|
||||
eval $set_cc_for_build
|
||||
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
|
||||
| grep -q __ARM_EABI__
|
||||
then
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
else
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnueabi
|
||||
fi
|
||||
aarch64:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
avr32*:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
exit ;;
|
||||
cris:Linux:*:*)
|
||||
echo cris-axis-linux-gnu
|
||||
exit ;;
|
||||
crisv32:Linux:*:*)
|
||||
echo crisv32-axis-linux-gnu
|
||||
exit ;;
|
||||
frv:Linux:*:*)
|
||||
echo frv-unknown-linux-gnu
|
||||
exit ;;
|
||||
ia64:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
exit ;;
|
||||
m32r*:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
exit ;;
|
||||
m68*:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
exit ;;
|
||||
mips:Linux:*:*)
|
||||
eval $set_cc_for_build
|
||||
sed 's/^ //' << EOF >$dummy.c
|
||||
#undef CPU
|
||||
#undef mips
|
||||
#undef mipsel
|
||||
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
|
||||
CPU=mipsel
|
||||
#else
|
||||
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
|
||||
CPU=mips
|
||||
#else
|
||||
CPU=
|
||||
#endif
|
||||
#endif
|
||||
EOF
|
||||
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
|
||||
/^CPU/{
|
||||
s: ::g
|
||||
p
|
||||
}'`"
|
||||
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
||||
;;
|
||||
mips64:Linux:*:*)
|
||||
eval $set_cc_for_build
|
||||
sed 's/^ //' << EOF >$dummy.c
|
||||
#undef CPU
|
||||
#undef mips64
|
||||
#undef mips64el
|
||||
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
|
||||
CPU=mips64el
|
||||
#else
|
||||
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
|
||||
CPU=mips64
|
||||
#else
|
||||
CPU=
|
||||
#endif
|
||||
#endif
|
||||
EOF
|
||||
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
|
||||
/^CPU/{
|
||||
s: ::g
|
||||
p
|
||||
}'`"
|
||||
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
||||
;;
|
||||
or32:Linux:*:*)
|
||||
echo or32-unknown-linux-gnu
|
||||
exit ;;
|
||||
ppc:Linux:*:*)
|
||||
echo powerpc-unknown-linux-gnu
|
||||
exit ;;
|
||||
ppc64:Linux:*:*)
|
||||
echo powerpc64-unknown-linux-gnu
|
||||
aarch64_be:Linux:*:*)
|
||||
UNAME_MACHINE=aarch64_be
|
||||
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
alpha:Linux:*:*)
|
||||
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
|
||||
@@ -947,105 +900,131 @@ EOF
|
||||
EV67) UNAME_MACHINE=alphaev67 ;;
|
||||
EV68*) UNAME_MACHINE=alphaev68 ;;
|
||||
esac
|
||||
objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
|
||||
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
|
||||
objdump --private-headers /bin/sh | grep -q ld.so.1
|
||||
if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
|
||||
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
arc:Linux:*:* | arceb:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
arm*:Linux:*:*)
|
||||
eval $set_cc_for_build
|
||||
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
|
||||
| grep -q __ARM_EABI__
|
||||
then
|
||||
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
else
|
||||
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
|
||||
| grep -q __ARM_PCS_VFP
|
||||
then
|
||||
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
|
||||
else
|
||||
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
|
||||
fi
|
||||
fi
|
||||
exit ;;
|
||||
avr32*:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
cris:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-axis-linux-${LIBC}
|
||||
exit ;;
|
||||
crisv32:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-axis-linux-${LIBC}
|
||||
exit ;;
|
||||
frv:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
hexagon:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
i*86:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-pc-linux-${LIBC}
|
||||
exit ;;
|
||||
ia64:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
m32r*:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
m68*:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
mips:Linux:*:* | mips64:Linux:*:*)
|
||||
eval $set_cc_for_build
|
||||
sed 's/^ //' << EOF >$dummy.c
|
||||
#undef CPU
|
||||
#undef ${UNAME_MACHINE}
|
||||
#undef ${UNAME_MACHINE}el
|
||||
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
|
||||
CPU=${UNAME_MACHINE}el
|
||||
#else
|
||||
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
|
||||
CPU=${UNAME_MACHINE}
|
||||
#else
|
||||
CPU=
|
||||
#endif
|
||||
#endif
|
||||
EOF
|
||||
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
|
||||
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
|
||||
;;
|
||||
or1k:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
or32:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
padre:Linux:*:*)
|
||||
echo sparc-unknown-linux-gnu
|
||||
echo sparc-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
parisc64:Linux:*:* | hppa64:Linux:*:*)
|
||||
echo hppa64-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
parisc:Linux:*:* | hppa:Linux:*:*)
|
||||
# Look for CPU level
|
||||
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
|
||||
PA7*) echo hppa1.1-unknown-linux-gnu ;;
|
||||
PA8*) echo hppa2.0-unknown-linux-gnu ;;
|
||||
*) echo hppa-unknown-linux-gnu ;;
|
||||
PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
|
||||
PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
|
||||
*) echo hppa-unknown-linux-${LIBC} ;;
|
||||
esac
|
||||
exit ;;
|
||||
parisc64:Linux:*:* | hppa64:Linux:*:*)
|
||||
echo hppa64-unknown-linux-gnu
|
||||
ppc64:Linux:*:*)
|
||||
echo powerpc64-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
ppc:Linux:*:*)
|
||||
echo powerpc-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
ppc64le:Linux:*:*)
|
||||
echo powerpc64le-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
ppcle:Linux:*:*)
|
||||
echo powerpcle-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
s390:Linux:*:* | s390x:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-ibm-linux
|
||||
echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
|
||||
exit ;;
|
||||
sh64*:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
sh*:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
sparc:Linux:*:* | sparc64:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
tile*:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
vax:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-dec-linux-gnu
|
||||
echo ${UNAME_MACHINE}-dec-linux-${LIBC}
|
||||
exit ;;
|
||||
x86_64:Linux:*:*)
|
||||
echo x86_64-unknown-linux-gnu
|
||||
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
xtensa*:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
i*86:Linux:*:*)
|
||||
# The BFD linker knows what the default object file format is, so
|
||||
# first see if it will tell us. cd to the root directory to prevent
|
||||
# problems with other programs or directories called `ld' in the path.
|
||||
# Set LC_ALL=C to ensure ld outputs messages in English.
|
||||
ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
|
||||
| sed -ne '/supported targets:/!d
|
||||
s/[ ][ ]*/ /g
|
||||
s/.*supported targets: *//
|
||||
s/ .*//
|
||||
p'`
|
||||
case "$ld_supported_targets" in
|
||||
elf32-i386)
|
||||
TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
|
||||
;;
|
||||
a.out-i386-linux)
|
||||
echo "${UNAME_MACHINE}-pc-linux-gnuaout"
|
||||
exit ;;
|
||||
"")
|
||||
# Either a pre-BFD a.out linker (linux-gnuoldld) or
|
||||
# one that does not give us useful --help.
|
||||
echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
|
||||
exit ;;
|
||||
esac
|
||||
# Determine whether the default compiler is a.out or elf
|
||||
eval $set_cc_for_build
|
||||
sed 's/^ //' << EOF >$dummy.c
|
||||
#include <features.h>
|
||||
#ifdef __ELF__
|
||||
# ifdef __GLIBC__
|
||||
# if __GLIBC__ >= 2
|
||||
LIBC=gnu
|
||||
# else
|
||||
LIBC=gnulibc1
|
||||
# endif
|
||||
# else
|
||||
LIBC=gnulibc1
|
||||
# endif
|
||||
#else
|
||||
#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
|
||||
LIBC=gnu
|
||||
#else
|
||||
LIBC=gnuaout
|
||||
#endif
|
||||
#endif
|
||||
#ifdef __dietlibc__
|
||||
LIBC=dietlibc
|
||||
#endif
|
||||
EOF
|
||||
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
|
||||
/^LIBC/{
|
||||
s: ::g
|
||||
p
|
||||
}'`"
|
||||
test x"${LIBC}" != x && {
|
||||
echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
|
||||
exit
|
||||
}
|
||||
test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
|
||||
;;
|
||||
i*86:DYNIX/ptx:4*:*)
|
||||
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
|
||||
# earlier versions are messed up and put the nodename in both
|
||||
@@ -1074,7 +1053,7 @@ EOF
|
||||
i*86:syllable:*:*)
|
||||
echo ${UNAME_MACHINE}-pc-syllable
|
||||
exit ;;
|
||||
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
|
||||
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
|
||||
echo i386-unknown-lynxos${UNAME_RELEASE}
|
||||
exit ;;
|
||||
i*86:*DOS:*:*)
|
||||
@@ -1182,7 +1161,7 @@ EOF
|
||||
rs6000:LynxOS:2.*:*)
|
||||
echo rs6000-unknown-lynxos${UNAME_RELEASE}
|
||||
exit ;;
|
||||
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
|
||||
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
|
||||
echo powerpc-unknown-lynxos${UNAME_RELEASE}
|
||||
exit ;;
|
||||
SM[BE]S:UNIX_SV:*:*)
|
||||
@@ -1248,6 +1227,9 @@ EOF
|
||||
BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
|
||||
echo i586-pc-haiku
|
||||
exit ;;
|
||||
x86_64:Haiku:*:*)
|
||||
echo x86_64-unknown-haiku
|
||||
exit ;;
|
||||
SX-4:SUPER-UX:*:*)
|
||||
echo sx4-nec-superux${UNAME_RELEASE}
|
||||
exit ;;
|
||||
@@ -1274,9 +1256,21 @@ EOF
|
||||
exit ;;
|
||||
*:Darwin:*:*)
|
||||
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
|
||||
eval $set_cc_for_build
|
||||
if test "$UNAME_PROCESSOR" = unknown ; then
|
||||
UNAME_PROCESSOR=powerpc
|
||||
fi
|
||||
if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
|
||||
if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
|
||||
(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
|
||||
grep IS_64BIT_ARCH >/dev/null
|
||||
then
|
||||
case $UNAME_PROCESSOR in
|
||||
unknown) UNAME_PROCESSOR=powerpc ;;
|
||||
i386) UNAME_PROCESSOR=x86_64 ;;
|
||||
powerpc) UNAME_PROCESSOR=powerpc64 ;;
|
||||
esac
|
||||
fi
|
||||
fi
|
||||
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
|
||||
exit ;;
|
||||
*:procnto*:*:* | *:QNX:[0123456789]*:*)
|
||||
@@ -1290,7 +1284,10 @@ EOF
|
||||
*:QNX:*:4*)
|
||||
echo i386-pc-qnx
|
||||
exit ;;
|
||||
NSE-?:NONSTOP_KERNEL:*:*)
|
||||
NEO-?:NONSTOP_KERNEL:*:*)
|
||||
echo neo-tandem-nsk${UNAME_RELEASE}
|
||||
exit ;;
|
||||
NSE-*:NONSTOP_KERNEL:*:*)
|
||||
echo nse-tandem-nsk${UNAME_RELEASE}
|
||||
exit ;;
|
||||
NSR-?:NONSTOP_KERNEL:*:*)
|
||||
@@ -1359,11 +1356,11 @@ EOF
|
||||
i*86:AROS:*:*)
|
||||
echo ${UNAME_MACHINE}-pc-aros
|
||||
exit ;;
|
||||
x86_64:VMkernel:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-esx
|
||||
exit ;;
|
||||
esac
|
||||
|
||||
#echo '(No uname command or uname output not recognized.)' 1>&2
|
||||
#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
|
||||
|
||||
eval $set_cc_for_build
|
||||
cat >$dummy.c <<EOF
|
||||
#ifdef _SEQUENT_
|
||||
@@ -1,44 +1,40 @@
|
||||
#! /bin/sh
|
||||
# Configuration validation subroutine script.
|
||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
|
||||
# Free Software Foundation, Inc.
|
||||
# Copyright 1992-2013 Free Software Foundation, Inc.
|
||||
|
||||
timestamp='2009-04-17'
|
||||
timestamp='2013-04-24'
|
||||
|
||||
# This file is (in principle) common to ALL GNU software.
|
||||
# The presence of a machine in this file suggests that SOME GNU software
|
||||
# can handle that machine. It does not imply ALL GNU software can.
|
||||
#
|
||||
# This file is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# This file is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
# This program is distributed in the hope that it will be useful, but
|
||||
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
# General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
|
||||
# 02110-1301, USA.
|
||||
# along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
# As a special exception to the GNU General Public License, if you
|
||||
# distribute this file as part of a program that contains a
|
||||
# configuration script generated by Autoconf, you may include it under
|
||||
# the same distribution terms that you use for the rest of that program.
|
||||
# the same distribution terms that you use for the rest of that
|
||||
# program. This Exception is an additional permission under section 7
|
||||
# of the GNU General Public License, version 3 ("GPLv3").
|
||||
|
||||
|
||||
# Please send patches to <config-patches@gnu.org>. Submit a context
|
||||
# diff and a properly formatted ChangeLog entry.
|
||||
# Please send patches with a ChangeLog entry to config-patches@gnu.org.
|
||||
#
|
||||
# Configuration subroutine to validate and canonicalize a configuration type.
|
||||
# Supply the specified configuration type as an argument.
|
||||
# If it is invalid, we print an error message on stderr and exit with code 1.
|
||||
# Otherwise, we print the canonical config type on stdout and succeed.
|
||||
|
||||
# You can get the latest version of this script from:
|
||||
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
|
||||
|
||||
# This file is supposed to be the same for all GNU packages
|
||||
# and recognize all the CPU types, system types and aliases
|
||||
# that are meaningful with *any* GNU software.
|
||||
@@ -72,8 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
|
||||
version="\
|
||||
GNU config.sub ($timestamp)
|
||||
|
||||
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
|
||||
2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
||||
Copyright 1992-2013 Free Software Foundation, Inc.
|
||||
|
||||
This is free software; see the source for copying conditions. There is NO
|
||||
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
||||
@@ -120,13 +115,18 @@ esac
|
||||
# Here we must recognize all the valid KERNEL-OS combinations.
|
||||
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
|
||||
case $maybe_os in
|
||||
nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
|
||||
uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
|
||||
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
|
||||
linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
|
||||
knetbsd*-gnu* | netbsd*-gnu* | \
|
||||
kopensolaris*-gnu* | \
|
||||
storm-chaos* | os2-emx* | rtmk-nova*)
|
||||
os=-$maybe_os
|
||||
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
|
||||
;;
|
||||
android-linux)
|
||||
os=-linux-android
|
||||
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
|
||||
;;
|
||||
*)
|
||||
basic_machine=`echo $1 | sed 's/-[^-]*$//'`
|
||||
if [ $basic_machine != $1 ]
|
||||
@@ -149,10 +149,13 @@ case $os in
|
||||
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
|
||||
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
|
||||
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
|
||||
-apple | -axis | -knuth | -cray)
|
||||
-apple | -axis | -knuth | -cray | -microblaze*)
|
||||
os=
|
||||
basic_machine=$1
|
||||
;;
|
||||
-bluegene*)
|
||||
os=-cnk
|
||||
;;
|
||||
-sim | -cisco | -oki | -wec | -winbond)
|
||||
os=
|
||||
basic_machine=$1
|
||||
@@ -215,6 +218,12 @@ case $os in
|
||||
-isc*)
|
||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
||||
;;
|
||||
-lynx*178)
|
||||
os=-lynxos178
|
||||
;;
|
||||
-lynx*5)
|
||||
os=-lynxos5
|
||||
;;
|
||||
-lynx*)
|
||||
os=-lynxos
|
||||
;;
|
||||
@@ -239,20 +248,27 @@ case $basic_machine in
|
||||
# Some are omitted here because they have special meanings below.
|
||||
1750a | 580 \
|
||||
| a29k \
|
||||
| aarch64 | aarch64_be \
|
||||
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
|
||||
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
|
||||
| am33_2.0 \
|
||||
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
|
||||
| arc | arceb \
|
||||
| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
|
||||
| avr | avr32 \
|
||||
| be32 | be64 \
|
||||
| bfin \
|
||||
| c4x | clipper \
|
||||
| d10v | d30v | dlx | dsp16xx \
|
||||
| epiphany \
|
||||
| fido | fr30 | frv \
|
||||
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
|
||||
| hexagon \
|
||||
| i370 | i860 | i960 | ia64 \
|
||||
| ip2k | iq2000 \
|
||||
| le32 | le64 \
|
||||
| lm32 \
|
||||
| m32c | m32r | m32rle | m68000 | m68k | m88k \
|
||||
| maxq | mb | microblaze | mcore | mep | metag \
|
||||
| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
|
||||
| mips | mipsbe | mipseb | mipsel | mipsle \
|
||||
| mips16 \
|
||||
| mips64 | mips64el \
|
||||
@@ -270,32 +286,45 @@ case $basic_machine in
|
||||
| mipsisa64r2 | mipsisa64r2el \
|
||||
| mipsisa64sb1 | mipsisa64sb1el \
|
||||
| mipsisa64sr71k | mipsisa64sr71kel \
|
||||
| mipsr5900 | mipsr5900el \
|
||||
| mipstx39 | mipstx39el \
|
||||
| mn10200 | mn10300 \
|
||||
| moxie \
|
||||
| mt \
|
||||
| msp430 \
|
||||
| nios | nios2 \
|
||||
| nds32 | nds32le | nds32be \
|
||||
| nios | nios2 | nios2eb | nios2el \
|
||||
| ns16k | ns32k \
|
||||
| or32 \
|
||||
| open8 \
|
||||
| or1k | or32 \
|
||||
| pdp10 | pdp11 | pj | pjl \
|
||||
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
|
||||
| powerpc | powerpc64 | powerpc64le | powerpcle \
|
||||
| pyramid \
|
||||
| rl78 | rx \
|
||||
| score \
|
||||
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
|
||||
| sh64 | sh64le \
|
||||
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
|
||||
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
|
||||
| spu | strongarm \
|
||||
| tahoe | thumb | tic4x | tic80 | tron \
|
||||
| v850 | v850e \
|
||||
| spu \
|
||||
| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
|
||||
| ubicom32 \
|
||||
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
|
||||
| we32k \
|
||||
| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
|
||||
| x86 | xc16x | xstormy16 | xtensa \
|
||||
| z8k | z80)
|
||||
basic_machine=$basic_machine-unknown
|
||||
;;
|
||||
m6811 | m68hc11 | m6812 | m68hc12)
|
||||
# Motorola 68HC11/12.
|
||||
c54x)
|
||||
basic_machine=tic54x-unknown
|
||||
;;
|
||||
c55x)
|
||||
basic_machine=tic55x-unknown
|
||||
;;
|
||||
c6x)
|
||||
basic_machine=tic6x-unknown
|
||||
;;
|
||||
m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
|
||||
basic_machine=$basic_machine-unknown
|
||||
os=-none
|
||||
;;
|
||||
@@ -305,6 +334,21 @@ case $basic_machine in
|
||||
basic_machine=mt-unknown
|
||||
;;
|
||||
|
||||
strongarm | thumb | xscale)
|
||||
basic_machine=arm-unknown
|
||||
;;
|
||||
xgate)
|
||||
basic_machine=$basic_machine-unknown
|
||||
os=-none
|
||||
;;
|
||||
xscaleeb)
|
||||
basic_machine=armeb-unknown
|
||||
;;
|
||||
|
||||
xscaleel)
|
||||
basic_machine=armel-unknown
|
||||
;;
|
||||
|
||||
# We use `pc' rather than `unknown'
|
||||
# because (1) that's what they normally are, and
|
||||
# (2) the word "unknown" tends to confuse beginning users.
|
||||
@@ -319,25 +363,30 @@ case $basic_machine in
|
||||
# Recognize the basic CPU types with company name.
|
||||
580-* \
|
||||
| a29k-* \
|
||||
| aarch64-* | aarch64_be-* \
|
||||
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
|
||||
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
|
||||
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
|
||||
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
|
||||
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
|
||||
| avr-* | avr32-* \
|
||||
| be32-* | be64-* \
|
||||
| bfin-* | bs2000-* \
|
||||
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
|
||||
| c[123]* | c30-* | [cjt]90-* | c4x-* \
|
||||
| clipper-* | craynv-* | cydra-* \
|
||||
| d10v-* | d30v-* | dlx-* \
|
||||
| elxsi-* \
|
||||
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
|
||||
| h8300-* | h8500-* \
|
||||
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
|
||||
| hexagon-* \
|
||||
| i*86-* | i860-* | i960-* | ia64-* \
|
||||
| ip2k-* | iq2000-* \
|
||||
| le32-* | le64-* \
|
||||
| lm32-* \
|
||||
| m32c-* | m32r-* | m32rle-* \
|
||||
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
|
||||
| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
|
||||
| microblaze-* | microblazeel-* \
|
||||
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
|
||||
| mips16-* \
|
||||
| mips64-* | mips64el-* \
|
||||
@@ -355,28 +404,34 @@ case $basic_machine in
|
||||
| mipsisa64r2-* | mipsisa64r2el-* \
|
||||
| mipsisa64sb1-* | mipsisa64sb1el-* \
|
||||
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
|
||||
| mipsr5900-* | mipsr5900el-* \
|
||||
| mipstx39-* | mipstx39el-* \
|
||||
| mmix-* \
|
||||
| mt-* \
|
||||
| msp430-* \
|
||||
| nios-* | nios2-* \
|
||||
| nds32-* | nds32le-* | nds32be-* \
|
||||
| nios-* | nios2-* | nios2eb-* | nios2el-* \
|
||||
| none-* | np1-* | ns16k-* | ns32k-* \
|
||||
| open8-* \
|
||||
| orion-* \
|
||||
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
|
||||
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
|
||||
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
|
||||
| pyramid-* \
|
||||
| romp-* | rs6000-* \
|
||||
| rl78-* | romp-* | rs6000-* | rx-* \
|
||||
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
|
||||
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
|
||||
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
|
||||
| sparclite-* \
|
||||
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
|
||||
| tahoe-* | thumb-* \
|
||||
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
|
||||
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
|
||||
| tahoe-* \
|
||||
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
|
||||
| tile*-* \
|
||||
| tron-* \
|
||||
| v850-* | v850e-* | vax-* \
|
||||
| ubicom32-* \
|
||||
| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
|
||||
| vax-* \
|
||||
| we32k-* \
|
||||
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
|
||||
| x86-* | x86_64-* | xc16x-* | xps100-* \
|
||||
| xstormy16-* | xtensa*-* \
|
||||
| ymp-* \
|
||||
| z8k-* | z80-*)
|
||||
@@ -467,6 +522,19 @@ case $basic_machine in
|
||||
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
os=-linux
|
||||
;;
|
||||
bluegene*)
|
||||
basic_machine=powerpc-ibm
|
||||
os=-cnk
|
||||
;;
|
||||
c54x-*)
|
||||
basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
;;
|
||||
c55x-*)
|
||||
basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
;;
|
||||
c6x-*)
|
||||
basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
;;
|
||||
c90)
|
||||
basic_machine=c90-cray
|
||||
os=-unicos
|
||||
@@ -503,7 +571,7 @@ case $basic_machine in
|
||||
basic_machine=craynv-cray
|
||||
os=-unicosmp
|
||||
;;
|
||||
cr16)
|
||||
cr16 | cr16-*)
|
||||
basic_machine=cr16-unknown
|
||||
os=-elf
|
||||
;;
|
||||
@@ -661,7 +729,6 @@ case $basic_machine in
|
||||
i370-ibm* | ibm*)
|
||||
basic_machine=i370-ibm
|
||||
;;
|
||||
# I'm not sure what "Sysv32" means. Should this be sysv3.2?
|
||||
i*86v32)
|
||||
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
|
||||
os=-sysv32
|
||||
@@ -719,6 +786,13 @@ case $basic_machine in
|
||||
basic_machine=ns32k-utek
|
||||
os=-sysv
|
||||
;;
|
||||
microblaze*)
|
||||
basic_machine=microblaze-xilinx
|
||||
;;
|
||||
mingw64)
|
||||
basic_machine=x86_64-pc
|
||||
os=-mingw64
|
||||
;;
|
||||
mingw32)
|
||||
basic_machine=i386-pc
|
||||
os=-mingw32
|
||||
@@ -755,10 +829,18 @@ case $basic_machine in
|
||||
ms1-*)
|
||||
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
|
||||
;;
|
||||
msys)
|
||||
basic_machine=i386-pc
|
||||
os=-msys
|
||||
;;
|
||||
mvs)
|
||||
basic_machine=i370-ibm
|
||||
os=-mvs
|
||||
;;
|
||||
nacl)
|
||||
basic_machine=le32-unknown
|
||||
os=-nacl
|
||||
;;
|
||||
ncr3000)
|
||||
basic_machine=i486-ncr
|
||||
os=-sysv4
|
||||
@@ -823,6 +905,12 @@ case $basic_machine in
|
||||
np1)
|
||||
basic_machine=np1-gould
|
||||
;;
|
||||
neo-tandem)
|
||||
basic_machine=neo-tandem
|
||||
;;
|
||||
nse-tandem)
|
||||
basic_machine=nse-tandem
|
||||
;;
|
||||
nsr-tandem)
|
||||
basic_machine=nsr-tandem
|
||||
;;
|
||||
@@ -905,9 +993,10 @@ case $basic_machine in
|
||||
;;
|
||||
power) basic_machine=power-ibm
|
||||
;;
|
||||
ppc) basic_machine=powerpc-unknown
|
||||
ppc | ppcbe) basic_machine=powerpc-unknown
|
||||
;;
|
||||
ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
ppc-* | ppcbe-*)
|
||||
basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
;;
|
||||
ppcle | powerpclittle | ppc-le | powerpc-little)
|
||||
basic_machine=powerpcle-unknown
|
||||
@@ -932,7 +1021,11 @@ case $basic_machine in
|
||||
basic_machine=i586-unknown
|
||||
os=-pw32
|
||||
;;
|
||||
rdos)
|
||||
rdos | rdos64)
|
||||
basic_machine=x86_64-pc
|
||||
os=-rdos
|
||||
;;
|
||||
rdos32)
|
||||
basic_machine=i386-pc
|
||||
os=-rdos
|
||||
;;
|
||||
@@ -1001,6 +1094,9 @@ case $basic_machine in
|
||||
basic_machine=i860-stratus
|
||||
os=-sysv4
|
||||
;;
|
||||
strongarm-* | thumb-*)
|
||||
basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
;;
|
||||
sun2)
|
||||
basic_machine=m68000-sun
|
||||
;;
|
||||
@@ -1057,20 +1153,8 @@ case $basic_machine in
|
||||
basic_machine=t90-cray
|
||||
os=-unicos
|
||||
;;
|
||||
tic54x | c54x*)
|
||||
basic_machine=tic54x-unknown
|
||||
os=-coff
|
||||
;;
|
||||
tic55x | c55x*)
|
||||
basic_machine=tic55x-unknown
|
||||
os=-coff
|
||||
;;
|
||||
tic6x | c6x*)
|
||||
basic_machine=tic6x-unknown
|
||||
os=-coff
|
||||
;;
|
||||
tile*)
|
||||
basic_machine=tile-unknown
|
||||
basic_machine=$basic_machine-unknown
|
||||
os=-linux-gnu
|
||||
;;
|
||||
tx39)
|
||||
@@ -1140,6 +1224,9 @@ case $basic_machine in
|
||||
xps | xps100)
|
||||
basic_machine=xps100-honeywell
|
||||
;;
|
||||
xscale-* | xscalee[bl]-*)
|
||||
basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
|
||||
;;
|
||||
ymp)
|
||||
basic_machine=ymp-cray
|
||||
os=-unicos
|
||||
@@ -1240,6 +1327,9 @@ case $os in
|
||||
# First match some system type aliases
|
||||
# that might get confused with valid system types.
|
||||
# -solaris* is a basic system type, with this one exception.
|
||||
-auroraux)
|
||||
os=-auroraux
|
||||
;;
|
||||
-solaris1 | -solaris1.*)
|
||||
os=`echo $os | sed -e 's|solaris1|sunos4|'`
|
||||
;;
|
||||
@@ -1260,22 +1350,23 @@ case $os in
|
||||
# Each alternative MUST END IN A *, to match a version number.
|
||||
# -sysv* is not here because it comes later, after sysvr4.
|
||||
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
|
||||
| -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
|
||||
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
|
||||
| -kopensolaris* \
|
||||
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
|
||||
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
|
||||
| -sym* | -kopensolaris* | -plan9* \
|
||||
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
|
||||
| -aos* | -aros* \
|
||||
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
|
||||
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
|
||||
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
|
||||
| -openbsd* | -solidbsd* \
|
||||
| -bitrig* | -openbsd* | -solidbsd* \
|
||||
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
|
||||
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
|
||||
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
|
||||
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
|
||||
| -chorusos* | -chorusrdb* | -cegcc* \
|
||||
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
||||
| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
|
||||
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
||||
| -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
|
||||
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
|
||||
| -uxpv* | -beos* | -mpeix* | -udk* \
|
||||
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
|
||||
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
|
||||
@@ -1283,7 +1374,7 @@ case $os in
|
||||
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
|
||||
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
|
||||
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
|
||||
| -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
|
||||
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
|
||||
# Remember, each alternative MUST END IN *, to match a version number.
|
||||
;;
|
||||
-qnx*)
|
||||
@@ -1407,15 +1498,14 @@ case $os in
|
||||
-aros*)
|
||||
os=-aros
|
||||
;;
|
||||
-kaos*)
|
||||
os=-kaos
|
||||
;;
|
||||
-zvmoe)
|
||||
os=-zvmoe
|
||||
;;
|
||||
-dicos*)
|
||||
os=-dicos
|
||||
;;
|
||||
-nacl*)
|
||||
;;
|
||||
-none)
|
||||
;;
|
||||
*)
|
||||
@@ -1456,6 +1546,18 @@ case $basic_machine in
|
||||
c4x-* | tic4x-*)
|
||||
os=-coff
|
||||
;;
|
||||
hexagon-*)
|
||||
os=-elf
|
||||
;;
|
||||
tic54x-*)
|
||||
os=-coff
|
||||
;;
|
||||
tic55x-*)
|
||||
os=-coff
|
||||
;;
|
||||
tic6x-*)
|
||||
os=-coff
|
||||
;;
|
||||
# This must come before the *-dec entry.
|
||||
pdp10-*)
|
||||
os=-tops20
|
||||
@@ -1474,9 +1576,6 @@ case $basic_machine in
|
||||
;;
|
||||
m68000-sun)
|
||||
os=-sunos3
|
||||
# This also exists in the configure program, but was not the
|
||||
# default.
|
||||
# os=-sunos4
|
||||
;;
|
||||
m68*-cisco)
|
||||
os=-aout
|
||||
@@ -1490,6 +1589,9 @@ case $basic_machine in
|
||||
mips*-*)
|
||||
os=-elf
|
||||
;;
|
||||
or1k-*)
|
||||
os=-elf
|
||||
;;
|
||||
or32-*)
|
||||
os=-coff
|
||||
;;
|
||||
@@ -1613,7 +1715,7 @@ case $basic_machine in
|
||||
-sunos*)
|
||||
vendor=sun
|
||||
;;
|
||||
-aix*)
|
||||
-cnk*|-aix*)
|
||||
vendor=ibm
|
||||
;;
|
||||
-beos*)
|
||||
@@ -1,10 +1,9 @@
|
||||
#! /bin/sh
|
||||
# depcomp - compile a program generating dependencies as side-effects
|
||||
|
||||
scriptversion=2009-04-28.21; # UTC
|
||||
scriptversion=2013-05-30.07; # UTC
|
||||
|
||||
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
|
||||
# Software Foundation, Inc.
|
||||
# Copyright (C) 1999-2013 Free Software Foundation, Inc.
|
||||
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
@@ -28,7 +27,7 @@ scriptversion=2009-04-28.21; # UTC
|
||||
|
||||
case $1 in
|
||||
'')
|
||||
echo "$0: No command. Try \`$0 --help' for more information." 1>&2
|
||||
echo "$0: No command. Try '$0 --help' for more information." 1>&2
|
||||
exit 1;
|
||||
;;
|
||||
-h | --h*)
|
||||
@@ -40,11 +39,11 @@ as side-effects.
|
||||
|
||||
Environment variables:
|
||||
depmode Dependency tracking mode.
|
||||
source Source file read by `PROGRAMS ARGS'.
|
||||
object Object file output by `PROGRAMS ARGS'.
|
||||
source Source file read by 'PROGRAMS ARGS'.
|
||||
object Object file output by 'PROGRAMS ARGS'.
|
||||
DEPDIR directory where to store dependencies.
|
||||
depfile Dependency file to output.
|
||||
tmpdepfile Temporary file to use when outputing dependencies.
|
||||
tmpdepfile Temporary file to use when outputting dependencies.
|
||||
libtool Whether libtool is used (yes/no).
|
||||
|
||||
Report bugs to <bug-automake@gnu.org>.
|
||||
@@ -57,6 +56,66 @@ EOF
|
||||
;;
|
||||
esac
|
||||
|
||||
# Get the directory component of the given path, and save it in the
|
||||
# global variables '$dir'. Note that this directory component will
|
||||
# be either empty or ending with a '/' character. This is deliberate.
|
||||
set_dir_from ()
|
||||
{
|
||||
case $1 in
|
||||
*/*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
|
||||
*) dir=;;
|
||||
esac
|
||||
}
|
||||
|
||||
# Get the suffix-stripped basename of the given path, and save it the
|
||||
# global variable '$base'.
|
||||
set_base_from ()
|
||||
{
|
||||
base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
|
||||
}
|
||||
|
||||
# If no dependency file was actually created by the compiler invocation,
|
||||
# we still have to create a dummy depfile, to avoid errors with the
|
||||
# Makefile "include basename.Plo" scheme.
|
||||
make_dummy_depfile ()
|
||||
{
|
||||
echo "#dummy" > "$depfile"
|
||||
}
|
||||
|
||||
# Factor out some common post-processing of the generated depfile.
|
||||
# Requires the auxiliary global variable '$tmpdepfile' to be set.
|
||||
aix_post_process_depfile ()
|
||||
{
|
||||
# If the compiler actually managed to produce a dependency file,
|
||||
# post-process it.
|
||||
if test -f "$tmpdepfile"; then
|
||||
# Each line is of the form 'foo.o: dependency.h'.
|
||||
# Do two passes, one to just change these to
|
||||
# $object: dependency.h
|
||||
# and one to simply output
|
||||
# dependency.h:
|
||||
# which is needed to avoid the deleted-header problem.
|
||||
{ sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
|
||||
sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
|
||||
} > "$depfile"
|
||||
rm -f "$tmpdepfile"
|
||||
else
|
||||
make_dummy_depfile
|
||||
fi
|
||||
}
|
||||
|
||||
# A tabulation character.
|
||||
tab=' '
|
||||
# A newline character.
|
||||
nl='
|
||||
'
|
||||
# Character ranges might be problematic outside the C locale.
|
||||
# These definitions help.
|
||||
upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
|
||||
lower=abcdefghijklmnopqrstuvwxyz
|
||||
digits=0123456789
|
||||
alpha=${upper}${lower}
|
||||
|
||||
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
|
||||
echo "depcomp: Variables source, object and depmode must be set" 1>&2
|
||||
exit 1
|
||||
@@ -69,6 +128,9 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
|
||||
|
||||
rm -f "$tmpdepfile"
|
||||
|
||||
# Avoid interferences from the environment.
|
||||
gccflag= dashmflag=
|
||||
|
||||
# Some modes work just like other modes, but use different flags. We
|
||||
# parameterize here, but still list the modes in the big case below,
|
||||
# to make depend.m4 easier to write. Note that we *cannot* use a case
|
||||
@@ -90,10 +152,24 @@ if test "$depmode" = msvcmsys; then
|
||||
# This is just like msvisualcpp but w/o cygpath translation.
|
||||
# Just convert the backslash-escaped backslashes to single forward
|
||||
# slashes to satisfy depend.m4
|
||||
cygpath_u="sed s,\\\\\\\\,/,g"
|
||||
cygpath_u='sed s,\\\\,/,g'
|
||||
depmode=msvisualcpp
|
||||
fi
|
||||
|
||||
if test "$depmode" = msvc7msys; then
|
||||
# This is just like msvc7 but w/o cygpath translation.
|
||||
# Just convert the backslash-escaped backslashes to single forward
|
||||
# slashes to satisfy depend.m4
|
||||
cygpath_u='sed s,\\\\,/,g'
|
||||
depmode=msvc7
|
||||
fi
|
||||
|
||||
if test "$depmode" = xlc; then
|
||||
# IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
|
||||
gccflag=-qmakedep=gcc,-MF
|
||||
depmode=gcc
|
||||
fi
|
||||
|
||||
case "$depmode" in
|
||||
gcc3)
|
||||
## gcc 3 implements dependency tracking that does exactly what
|
||||
@@ -114,8 +190,7 @@ gcc3)
|
||||
done
|
||||
"$@"
|
||||
stat=$?
|
||||
if test $stat -eq 0; then :
|
||||
else
|
||||
if test $stat -ne 0; then
|
||||
rm -f "$tmpdepfile"
|
||||
exit $stat
|
||||
fi
|
||||
@@ -123,13 +198,17 @@ gcc3)
|
||||
;;
|
||||
|
||||
gcc)
|
||||
## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
|
||||
## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
|
||||
## (see the conditional assignment to $gccflag above).
|
||||
## There are various ways to get dependency output from gcc. Here's
|
||||
## why we pick this rather obscure method:
|
||||
## - Don't want to use -MD because we'd like the dependencies to end
|
||||
## up in a subdir. Having to rename by hand is ugly.
|
||||
## (We might end up doing this anyway to support other compilers.)
|
||||
## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
|
||||
## -MM, not -M (despite what the docs say).
|
||||
## -MM, not -M (despite what the docs say). Also, it might not be
|
||||
## supported by the other compilers which use the 'gcc' depmode.
|
||||
## - Using -M directly means running the compiler twice (even worse
|
||||
## than renaming).
|
||||
if test -z "$gccflag"; then
|
||||
@@ -137,31 +216,31 @@ gcc)
|
||||
fi
|
||||
"$@" -Wp,"$gccflag$tmpdepfile"
|
||||
stat=$?
|
||||
if test $stat -eq 0; then :
|
||||
else
|
||||
if test $stat -ne 0; then
|
||||
rm -f "$tmpdepfile"
|
||||
exit $stat
|
||||
fi
|
||||
rm -f "$depfile"
|
||||
echo "$object : \\" > "$depfile"
|
||||
alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
|
||||
## The second -e expression handles DOS-style file names with drive letters.
|
||||
# The second -e expression handles DOS-style file names with drive
|
||||
# letters.
|
||||
sed -e 's/^[^:]*: / /' \
|
||||
-e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
|
||||
## This next piece of magic avoids the `deleted header file' problem.
|
||||
## This next piece of magic avoids the "deleted header file" problem.
|
||||
## The problem is that when a header file which appears in a .P file
|
||||
## is deleted, the dependency causes make to die (because there is
|
||||
## typically no way to rebuild the header). We avoid this by adding
|
||||
## dummy dependencies for each header file. Too bad gcc doesn't do
|
||||
## this for us directly.
|
||||
tr ' ' '
|
||||
' < "$tmpdepfile" |
|
||||
## Some versions of gcc put a space before the `:'. On the theory
|
||||
## Some versions of gcc put a space before the ':'. On the theory
|
||||
## that the space means something, we add a space to the output as
|
||||
## well.
|
||||
## well. hp depmode also adds that space, but also prefixes the VPATH
|
||||
## to the object. Take care to not repeat it in the output.
|
||||
## Some versions of the HPUX 10.20 sed can't process this invocation
|
||||
## correctly. Breaking it into two sed invocations is a workaround.
|
||||
sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
|
||||
tr ' ' "$nl" < "$tmpdepfile" \
|
||||
| sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
|
||||
| sed -e 's/$/ :/' >> "$depfile"
|
||||
rm -f "$tmpdepfile"
|
||||
;;
|
||||
|
||||
@@ -179,8 +258,7 @@ sgi)
|
||||
"$@" -MDupdate "$tmpdepfile"
|
||||
fi
|
||||
stat=$?
|
||||
if test $stat -eq 0; then :
|
||||
else
|
||||
if test $stat -ne 0; then
|
||||
rm -f "$tmpdepfile"
|
||||
exit $stat
|
||||
fi
|
||||
@@ -188,43 +266,41 @@ sgi)
|
||||
|
||||
if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
|
||||
echo "$object : \\" > "$depfile"
|
||||
|
||||
# Clip off the initial element (the dependent). Don't try to be
|
||||
# clever and replace this with sed code, as IRIX sed won't handle
|
||||
# lines with more than a fixed number of characters (4096 in
|
||||
# IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
|
||||
# the IRIX cc adds comments like `#:fec' to the end of the
|
||||
# the IRIX cc adds comments like '#:fec' to the end of the
|
||||
# dependency line.
|
||||
tr ' ' '
|
||||
' < "$tmpdepfile" \
|
||||
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
|
||||
tr '
|
||||
' ' ' >> "$depfile"
|
||||
tr ' ' "$nl" < "$tmpdepfile" \
|
||||
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
|
||||
| tr "$nl" ' ' >> "$depfile"
|
||||
echo >> "$depfile"
|
||||
|
||||
# The second pass generates a dummy entry for each header file.
|
||||
tr ' ' '
|
||||
' < "$tmpdepfile" \
|
||||
tr ' ' "$nl" < "$tmpdepfile" \
|
||||
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
|
||||
>> "$depfile"
|
||||
else
|
||||
# The sourcefile does not contain any dependencies, so just
|
||||
# store a dummy comment line, to avoid errors with the Makefile
|
||||
# "include basename.Plo" scheme.
|
||||
echo "#dummy" > "$depfile"
|
||||
make_dummy_depfile
|
||||
fi
|
||||
rm -f "$tmpdepfile"
|
||||
;;
|
||||
|
||||
xlc)
|
||||
# This case exists only to let depend.m4 do its work. It works by
|
||||
# looking at the text of this script. This case will never be run,
|
||||
# since it is checked for above.
|
||||
exit 1
|
||||
;;
|
||||
|
||||
aix)
|
||||
# The C for AIX Compiler uses -M and outputs the dependencies
|
||||
# in a .u file. In older versions, this file always lives in the
|
||||
# current directory. Also, the AIX compiler puts `$object:' at the
|
||||
# current directory. Also, the AIX compiler puts '$object:' at the
|
||||
# start of each line; $object doesn't have directory information.
|
||||
# Version 6 uses the directory in both cases.
|
||||
dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
|
||||
test "x$dir" = "x$object" && dir=
|
||||
base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
|
||||
set_dir_from "$object"
|
||||
set_base_from "$object"
|
||||
if test "$libtool" = yes; then
|
||||
tmpdepfile1=$dir$base.u
|
||||
tmpdepfile2=$base.u
|
||||
@@ -237,9 +313,7 @@ aix)
|
||||
"$@" -M
|
||||
fi
|
||||
stat=$?
|
||||
|
||||
if test $stat -eq 0; then :
|
||||
else
|
||||
if test $stat -ne 0; then
|
||||
rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
|
||||
exit $stat
|
||||
fi
|
||||
@@ -248,44 +322,100 @@ aix)
|
||||
do
|
||||
test -f "$tmpdepfile" && break
|
||||
done
|
||||
if test -f "$tmpdepfile"; then
|
||||
# Each line is of the form `foo.o: dependent.h'.
|
||||
# Do two passes, one to just change these to
|
||||
# `$object: dependent.h' and one to simply `dependent.h:'.
|
||||
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
|
||||
# That's a tab and a space in the [].
|
||||
sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
|
||||
else
|
||||
# The sourcefile does not contain any dependencies, so just
|
||||
# store a dummy comment line, to avoid errors with the Makefile
|
||||
# "include basename.Plo" scheme.
|
||||
echo "#dummy" > "$depfile"
|
||||
aix_post_process_depfile
|
||||
;;
|
||||
|
||||
tcc)
|
||||
# tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
|
||||
# FIXME: That version still under development at the moment of writing.
|
||||
# Make that this statement remains true also for stable, released
|
||||
# versions.
|
||||
# It will wrap lines (doesn't matter whether long or short) with a
|
||||
# trailing '\', as in:
|
||||
#
|
||||
# foo.o : \
|
||||
# foo.c \
|
||||
# foo.h \
|
||||
#
|
||||
# It will put a trailing '\' even on the last line, and will use leading
|
||||
# spaces rather than leading tabs (at least since its commit 0394caf7
|
||||
# "Emit spaces for -MD").
|
||||
"$@" -MD -MF "$tmpdepfile"
|
||||
stat=$?
|
||||
if test $stat -ne 0; then
|
||||
rm -f "$tmpdepfile"
|
||||
exit $stat
|
||||
fi
|
||||
rm -f "$depfile"
|
||||
# Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
|
||||
# We have to change lines of the first kind to '$object: \'.
|
||||
sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
|
||||
# And for each line of the second kind, we have to emit a 'dep.h:'
|
||||
# dummy dependency, to avoid the deleted-header problem.
|
||||
sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
|
||||
rm -f "$tmpdepfile"
|
||||
;;
|
||||
|
||||
icc)
|
||||
# Intel's C compiler understands `-MD -MF file'. However on
|
||||
# icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
|
||||
# ICC 7.0 will fill foo.d with something like
|
||||
# foo.o: sub/foo.c
|
||||
# foo.o: sub/foo.h
|
||||
# which is wrong. We want:
|
||||
# sub/foo.o: sub/foo.c
|
||||
# sub/foo.o: sub/foo.h
|
||||
# sub/foo.c:
|
||||
# sub/foo.h:
|
||||
# ICC 7.1 will output
|
||||
## The order of this option in the case statement is important, since the
|
||||
## shell code in configure will try each of these formats in the order
|
||||
## listed in this file. A plain '-MD' option would be understood by many
|
||||
## compilers, so we must ensure this comes after the gcc and icc options.
|
||||
pgcc)
|
||||
# Portland's C compiler understands '-MD'.
|
||||
# Will always output deps to 'file.d' where file is the root name of the
|
||||
# source file under compilation, even if file resides in a subdirectory.
|
||||
# The object file name does not affect the name of the '.d' file.
|
||||
# pgcc 10.2 will output
|
||||
# foo.o: sub/foo.c sub/foo.h
|
||||
# and will wrap long lines using \ :
|
||||
# and will wrap long lines using '\' :
|
||||
# foo.o: sub/foo.c ... \
|
||||
# sub/foo.h ... \
|
||||
# ...
|
||||
set_dir_from "$object"
|
||||
# Use the source, not the object, to determine the base name, since
|
||||
# that's sadly what pgcc will do too.
|
||||
set_base_from "$source"
|
||||
tmpdepfile=$base.d
|
||||
|
||||
"$@" -MD -MF "$tmpdepfile"
|
||||
# For projects that build the same source file twice into different object
|
||||
# files, the pgcc approach of using the *source* file root name can cause
|
||||
# problems in parallel builds. Use a locking strategy to avoid stomping on
|
||||
# the same $tmpdepfile.
|
||||
lockdir=$base.d-lock
|
||||
trap "
|
||||
echo '$0: caught signal, cleaning up...' >&2
|
||||
rmdir '$lockdir'
|
||||
exit 1
|
||||
" 1 2 13 15
|
||||
numtries=100
|
||||
i=$numtries
|
||||
while test $i -gt 0; do
|
||||
# mkdir is a portable test-and-set.
|
||||
if mkdir "$lockdir" 2>/dev/null; then
|
||||
# This process acquired the lock.
|
||||
"$@" -MD
|
||||
stat=$?
|
||||
if test $stat -eq 0; then :
|
||||
# Release the lock.
|
||||
rmdir "$lockdir"
|
||||
break
|
||||
else
|
||||
# If the lock is being held by a different process, wait
|
||||
# until the winning process is done or we timeout.
|
||||
while test -d "$lockdir" && test $i -gt 0; do
|
||||
sleep 1
|
||||
i=`expr $i - 1`
|
||||
done
|
||||
fi
|
||||
i=`expr $i - 1`
|
||||
done
|
||||
trap - 1 2 13 15
|
||||
if test $i -le 0; then
|
||||
echo "$0: failed to acquire lock after $numtries attempts" >&2
|
||||
echo "$0: check lockdir '$lockdir'" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if test $stat -ne 0; then
|
||||
rm -f "$tmpdepfile"
|
||||
exit $stat
|
||||
fi
|
||||
@@ -297,8 +427,8 @@ icc)
|
||||
sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
|
||||
# Some versions of the HPUX 10.20 sed can't process this invocation
|
||||
# correctly. Breaking it into two sed invocations is a workaround.
|
||||
sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
|
||||
sed -e 's/$/ :/' >> "$depfile"
|
||||
sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
|
||||
| sed -e 's/$/ :/' >> "$depfile"
|
||||
rm -f "$tmpdepfile"
|
||||
;;
|
||||
|
||||
@@ -309,9 +439,8 @@ hp2)
|
||||
# 'foo.d', which lands next to the object file, wherever that
|
||||
# happens to be.
|
||||
# Much of this is similar to the tru64 case; see comments there.
|
||||
dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
|
||||
test "x$dir" = "x$object" && dir=
|
||||
base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
|
||||
set_dir_from "$object"
|
||||
set_base_from "$object"
|
||||
if test "$libtool" = yes; then
|
||||
tmpdepfile1=$dir$base.d
|
||||
tmpdepfile2=$dir.libs/$base.d
|
||||
@@ -322,8 +451,7 @@ hp2)
|
||||
"$@" +Maked
|
||||
fi
|
||||
stat=$?
|
||||
if test $stat -eq 0; then :
|
||||
else
|
||||
if test $stat -ne 0; then
|
||||
rm -f "$tmpdepfile1" "$tmpdepfile2"
|
||||
exit $stat
|
||||
fi
|
||||
@@ -333,8 +461,8 @@ hp2)
|
||||
test -f "$tmpdepfile" && break
|
||||
done
|
||||
if test -f "$tmpdepfile"; then
|
||||
sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
|
||||
# Add `dependent.h:' lines.
|
||||
sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
|
||||
# Add 'dependent.h:' lines.
|
||||
sed -ne '2,${
|
||||
s/^ *//
|
||||
s/ \\*$//
|
||||
@@ -342,67 +470,97 @@ hp2)
|
||||
p
|
||||
}' "$tmpdepfile" >> "$depfile"
|
||||
else
|
||||
echo "#dummy" > "$depfile"
|
||||
make_dummy_depfile
|
||||
fi
|
||||
rm -f "$tmpdepfile" "$tmpdepfile2"
|
||||
;;
|
||||
|
||||
tru64)
|
||||
# The Tru64 compiler uses -MD to generate dependencies as a side
|
||||
# effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
|
||||
# effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
|
||||
# At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
|
||||
# dependencies in `foo.d' instead, so we check for that too.
|
||||
# dependencies in 'foo.d' instead, so we check for that too.
|
||||
# Subdirectories are respected.
|
||||
dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
|
||||
test "x$dir" = "x$object" && dir=
|
||||
base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
|
||||
set_dir_from "$object"
|
||||
set_base_from "$object"
|
||||
|
||||
if test "$libtool" = yes; then
|
||||
# With Tru64 cc, shared objects can also be used to make a
|
||||
# static library. This mechanism is used in libtool 1.4 series to
|
||||
# handle both shared and static libraries in a single compilation.
|
||||
# With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
|
||||
#
|
||||
# With libtool 1.5 this exception was removed, and libtool now
|
||||
# generates 2 separate objects for the 2 libraries. These two
|
||||
# compilations output dependencies in $dir.libs/$base.o.d and
|
||||
# Libtool generates 2 separate objects for the 2 libraries. These
|
||||
# two compilations output dependencies in $dir.libs/$base.o.d and
|
||||
# in $dir$base.o.d. We have to check for both files, because
|
||||
# one of the two compilations can be disabled. We should prefer
|
||||
# $dir$base.o.d over $dir.libs/$base.o.d because the latter is
|
||||
# automatically cleaned when .libs/ is deleted, while ignoring
|
||||
# the former would cause a distcleancheck panic.
|
||||
tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
|
||||
tmpdepfile2=$dir$base.o.d # libtool 1.5
|
||||
tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
|
||||
tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
|
||||
tmpdepfile1=$dir$base.o.d # libtool 1.5
|
||||
tmpdepfile2=$dir.libs/$base.o.d # Likewise.
|
||||
tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504
|
||||
"$@" -Wc,-MD
|
||||
else
|
||||
tmpdepfile1=$dir$base.o.d
|
||||
tmpdepfile1=$dir$base.d
|
||||
tmpdepfile2=$dir$base.d
|
||||
tmpdepfile3=$dir$base.d
|
||||
tmpdepfile4=$dir$base.d
|
||||
"$@" -MD
|
||||
fi
|
||||
|
||||
stat=$?
|
||||
if test $stat -eq 0; then :
|
||||
else
|
||||
rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
|
||||
if test $stat -ne 0; then
|
||||
rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
|
||||
exit $stat
|
||||
fi
|
||||
|
||||
for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
|
||||
for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
|
||||
do
|
||||
test -f "$tmpdepfile" && break
|
||||
done
|
||||
if test -f "$tmpdepfile"; then
|
||||
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
|
||||
# That's a tab and a space in the [].
|
||||
sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
|
||||
# Same post-processing that is required for AIX mode.
|
||||
aix_post_process_depfile
|
||||
;;
|
||||
|
||||
msvc7)
|
||||
if test "$libtool" = yes; then
|
||||
showIncludes=-Wc,-showIncludes
|
||||
else
|
||||
echo "#dummy" > "$depfile"
|
||||
showIncludes=-showIncludes
|
||||
fi
|
||||
"$@" $showIncludes > "$tmpdepfile"
|
||||
stat=$?
|
||||
grep -v '^Note: including file: ' "$tmpdepfile"
|
||||
if test $stat -ne 0; then
|
||||
rm -f "$tmpdepfile"
|
||||
exit $stat
|
||||
fi
|
||||
rm -f "$depfile"
|
||||
echo "$object : \\" > "$depfile"
|
||||
# The first sed program below extracts the file names and escapes
|
||||
# backslashes for cygpath. The second sed program outputs the file
|
||||
# name when reading, but also accumulates all include files in the
|
||||
# hold buffer in order to output them again at the end. This only
|
||||
# works with sed implementations that can handle large buffers.
|
||||
sed < "$tmpdepfile" -n '
|
||||
/^Note: including file: *\(.*\)/ {
|
||||
s//\1/
|
||||
s/\\/\\\\/g
|
||||
p
|
||||
}' | $cygpath_u | sort -u | sed -n '
|
||||
s/ /\\ /g
|
||||
s/\(.*\)/'"$tab"'\1 \\/p
|
||||
s/.\(.*\) \\/\1:/
|
||||
H
|
||||
$ {
|
||||
s/.*/'"$tab"'/
|
||||
G
|
||||
p
|
||||
}' >> "$depfile"
|
||||
echo >> "$depfile" # make sure the fragment doesn't end with a backslash
|
||||
rm -f "$tmpdepfile"
|
||||
;;
|
||||
|
||||
msvc7msys)
|
||||
# This case exists only to let depend.m4 do its work. It works by
|
||||
# looking at the text of this script. This case will never be run,
|
||||
# since it is checked for above.
|
||||
exit 1
|
||||
;;
|
||||
|
||||
#nosideeffect)
|
||||
@@ -422,7 +580,7 @@ dashmstdout)
|
||||
shift
|
||||
fi
|
||||
|
||||
# Remove `-o $object'.
|
||||
# Remove '-o $object'.
|
||||
IFS=" "
|
||||
for arg
|
||||
do
|
||||
@@ -442,18 +600,18 @@ dashmstdout)
|
||||
done
|
||||
|
||||
test -z "$dashmflag" && dashmflag=-M
|
||||
# Require at least two characters before searching for `:'
|
||||
# Require at least two characters before searching for ':'
|
||||
# in the target name. This is to cope with DOS-style filenames:
|
||||
# a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
|
||||
# a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
|
||||
"$@" $dashmflag |
|
||||
sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
|
||||
sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
|
||||
rm -f "$depfile"
|
||||
cat < "$tmpdepfile" > "$depfile"
|
||||
tr ' ' '
|
||||
' < "$tmpdepfile" | \
|
||||
## Some versions of the HPUX 10.20 sed can't process this invocation
|
||||
## correctly. Breaking it into two sed invocations is a workaround.
|
||||
sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
|
||||
# Some versions of the HPUX 10.20 sed can't process this sed invocation
|
||||
# correctly. Breaking it into two sed invocations is a workaround.
|
||||
tr ' ' "$nl" < "$tmpdepfile" \
|
||||
| sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
|
||||
| sed -e 's/$/ :/' >> "$depfile"
|
||||
rm -f "$tmpdepfile"
|
||||
;;
|
||||
|
||||
@@ -503,12 +661,15 @@ makedepend)
|
||||
touch "$tmpdepfile"
|
||||
${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
|
||||
rm -f "$depfile"
|
||||
cat < "$tmpdepfile" > "$depfile"
|
||||
sed '1,2d' "$tmpdepfile" | tr ' ' '
|
||||
' | \
|
||||
## Some versions of the HPUX 10.20 sed can't process this invocation
|
||||
## correctly. Breaking it into two sed invocations is a workaround.
|
||||
sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
|
||||
# makedepend may prepend the VPATH from the source file name to the object.
|
||||
# No need to regex-escape $object, excess matching of '.' is harmless.
|
||||
sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
|
||||
# Some versions of the HPUX 10.20 sed can't process the last invocation
|
||||
# correctly. Breaking it into two sed invocations is a workaround.
|
||||
sed '1,2d' "$tmpdepfile" \
|
||||
| tr ' ' "$nl" \
|
||||
| sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
|
||||
| sed -e 's/$/ :/' >> "$depfile"
|
||||
rm -f "$tmpdepfile" "$tmpdepfile".bak
|
||||
;;
|
||||
|
||||
@@ -525,7 +686,7 @@ cpp)
|
||||
shift
|
||||
fi
|
||||
|
||||
# Remove `-o $object'.
|
||||
# Remove '-o $object'.
|
||||
IFS=" "
|
||||
for arg
|
||||
do
|
||||
@@ -544,10 +705,10 @@ cpp)
|
||||
esac
|
||||
done
|
||||
|
||||
"$@" -E |
|
||||
sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
|
||||
-e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
|
||||
sed '$ s: \\$::' > "$tmpdepfile"
|
||||
"$@" -E \
|
||||
| sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
|
||||
-e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
|
||||
| sed '$ s: \\$::' > "$tmpdepfile"
|
||||
rm -f "$depfile"
|
||||
echo "$object : \\" > "$depfile"
|
||||
cat < "$tmpdepfile" >> "$depfile"
|
||||
@@ -594,8 +755,8 @@ msvisualcpp)
|
||||
sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
|
||||
rm -f "$depfile"
|
||||
echo "$object : \\" > "$depfile"
|
||||
sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
|
||||
echo " " >> "$depfile"
|
||||
sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
|
||||
echo "$tab" >> "$depfile"
|
||||
sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
|
||||
rm -f "$tmpdepfile"
|
||||
;;
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
# install - install a program, script, or datafile
|
||||
|
||||
scriptversion=2009-04-28.21; # UTC
|
||||
scriptversion=2011-11-20.07; # UTC
|
||||
|
||||
# This originates from X11R5 (mit/util/scripts/install.sh), which was
|
||||
# later released in X11R6 (xc/config/util/install.sh) with the
|
||||
@@ -35,7 +35,7 @@ scriptversion=2009-04-28.21; # UTC
|
||||
# FSF changes to this file are in the public domain.
|
||||
#
|
||||
# Calling this script install-sh is preferred over install.sh, to prevent
|
||||
# `make' implicit rules from creating a file called install from it
|
||||
# 'make' implicit rules from creating a file called install from it
|
||||
# when there is no Makefile.
|
||||
#
|
||||
# This script is compatible with the BSD install script, but was written
|
||||
@@ -156,6 +156,10 @@ while test $# -ne 0; do
|
||||
-s) stripcmd=$stripprog;;
|
||||
|
||||
-t) dst_arg=$2
|
||||
# Protect names problematic for 'test' and other utilities.
|
||||
case $dst_arg in
|
||||
-* | [=\(\)!]) dst_arg=./$dst_arg;;
|
||||
esac
|
||||
shift;;
|
||||
|
||||
-T) no_target_directory=true;;
|
||||
@@ -186,6 +190,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
|
||||
fi
|
||||
shift # arg
|
||||
dst_arg=$arg
|
||||
# Protect names problematic for 'test' and other utilities.
|
||||
case $dst_arg in
|
||||
-* | [=\(\)!]) dst_arg=./$dst_arg;;
|
||||
esac
|
||||
done
|
||||
fi
|
||||
|
||||
@@ -194,13 +202,17 @@ if test $# -eq 0; then
|
||||
echo "$0: no input file specified." >&2
|
||||
exit 1
|
||||
fi
|
||||
# It's OK to call `install-sh -d' without argument.
|
||||
# It's OK to call 'install-sh -d' without argument.
|
||||
# This can happen when creating conditional directories.
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if test -z "$dir_arg"; then
|
||||
trap '(exit $?); exit' 1 2 13 15
|
||||
do_exit='(exit $ret); exit $ret'
|
||||
trap "ret=129; $do_exit" 1
|
||||
trap "ret=130; $do_exit" 2
|
||||
trap "ret=141; $do_exit" 13
|
||||
trap "ret=143; $do_exit" 15
|
||||
|
||||
# Set umask so as not to create temps with too-generous modes.
|
||||
# However, 'strip' requires both read and write access to temps.
|
||||
@@ -228,9 +240,9 @@ fi
|
||||
|
||||
for src
|
||||
do
|
||||
# Protect names starting with `-'.
|
||||
# Protect names problematic for 'test' and other utilities.
|
||||
case $src in
|
||||
-*) src=./$src;;
|
||||
-* | [=\(\)!]) src=./$src;;
|
||||
esac
|
||||
|
||||
if test -n "$dir_arg"; then
|
||||
@@ -252,12 +264,7 @@ do
|
||||
echo "$0: no destination specified." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
dst=$dst_arg
|
||||
# Protect names starting with `-'.
|
||||
case $dst in
|
||||
-*) dst=./$dst;;
|
||||
esac
|
||||
|
||||
# If destination is a directory, append the input filename; won't work
|
||||
# if double slashes aren't ignored.
|
||||
@@ -347,7 +354,7 @@ do
|
||||
if test -z "$dir_arg" || {
|
||||
# Check for POSIX incompatibilities with -m.
|
||||
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
|
||||
# other-writeable bit of parent directory when it shouldn't.
|
||||
# other-writable bit of parent directory when it shouldn't.
|
||||
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
|
||||
ls_ld_tmpdir=`ls -ld "$tmpdir"`
|
||||
case $ls_ld_tmpdir in
|
||||
@@ -385,7 +392,7 @@ do
|
||||
|
||||
case $dstdir in
|
||||
/*) prefix='/';;
|
||||
-*) prefix='./';;
|
||||
[-=\(\)!]*) prefix='./';;
|
||||
*) prefix='';;
|
||||
esac
|
||||
|
||||
@@ -403,7 +410,7 @@ do
|
||||
|
||||
for d
|
||||
do
|
||||
test -z "$d" && continue
|
||||
test X"$d" = X && continue
|
||||
|
||||
prefix=$prefix$d
|
||||
if test -d "$prefix"; then
|
||||
Executable → Regular
+50
-31
@@ -1,9 +1,9 @@
|
||||
|
||||
# libtool (GNU libtool) 2.4
|
||||
# libtool (GNU libtool) 2.4.2
|
||||
# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
|
||||
|
||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
|
||||
# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
|
||||
# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
|
||||
# This is free software; see the source for copying conditions. There is NO
|
||||
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
|
||||
@@ -41,6 +41,7 @@
|
||||
# --quiet, --silent don't print informational messages
|
||||
# --no-quiet, --no-silent
|
||||
# print informational messages (default)
|
||||
# --no-warn don't display warning messages
|
||||
# --tag=TAG use configuration variables from tag TAG
|
||||
# -v, --verbose print more informational messages than default
|
||||
# --no-verbose don't print the extra informational messages
|
||||
@@ -69,7 +70,7 @@
|
||||
# compiler: $LTCC
|
||||
# compiler flags: $LTCFLAGS
|
||||
# linker: $LD (gnu? $with_gnu_ld)
|
||||
# $progname: (GNU libtool) 2.4
|
||||
# $progname: (GNU libtool) 2.4.2
|
||||
# automake: $automake_version
|
||||
# autoconf: $autoconf_version
|
||||
#
|
||||
@@ -79,9 +80,9 @@
|
||||
|
||||
PROGRAM=libtool
|
||||
PACKAGE=libtool
|
||||
VERSION=2.4
|
||||
VERSION=2.4.2
|
||||
TIMESTAMP=""
|
||||
package_revision=1.3293
|
||||
package_revision=1.3337
|
||||
|
||||
# Be Bourne compatible
|
||||
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
||||
@@ -136,15 +137,10 @@ progpath="$0"
|
||||
|
||||
: ${CP="cp -f"}
|
||||
test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
|
||||
: ${EGREP="grep -E"}
|
||||
: ${FGREP="grep -F"}
|
||||
: ${GREP="grep"}
|
||||
: ${LN_S="ln -s"}
|
||||
: ${MAKE="make"}
|
||||
: ${MKDIR="mkdir"}
|
||||
: ${MV="mv -f"}
|
||||
: ${RM="rm -f"}
|
||||
: ${SED="sed"}
|
||||
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
|
||||
: ${Xsed="$SED -e 1s/^X//"}
|
||||
|
||||
@@ -387,7 +383,7 @@ case $progpath in
|
||||
;;
|
||||
*)
|
||||
save_IFS="$IFS"
|
||||
IFS=:
|
||||
IFS=${PATH_SEPARATOR-:}
|
||||
for progdir in $PATH; do
|
||||
IFS="$save_IFS"
|
||||
test -x "$progdir/$progname" && break
|
||||
@@ -771,8 +767,8 @@ func_help ()
|
||||
s*\$LTCFLAGS*'"$LTCFLAGS"'*
|
||||
s*\$LD*'"$LD"'*
|
||||
s/\$with_gnu_ld/'"$with_gnu_ld"'/
|
||||
s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
|
||||
s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
|
||||
s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
|
||||
s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
|
||||
p
|
||||
d
|
||||
}
|
||||
@@ -1052,6 +1048,7 @@ opt_finish=false
|
||||
opt_help=false
|
||||
opt_help_all=false
|
||||
opt_silent=:
|
||||
opt_warning=:
|
||||
opt_verbose=:
|
||||
opt_silent=false
|
||||
opt_verbose=false
|
||||
@@ -1118,6 +1115,10 @@ esac
|
||||
;;
|
||||
--no-silent|--no-quiet)
|
||||
opt_silent=false
|
||||
func_append preserve_args " $opt"
|
||||
;;
|
||||
--no-warning|--no-warn)
|
||||
opt_warning=false
|
||||
func_append preserve_args " $opt"
|
||||
;;
|
||||
--no-verbose)
|
||||
@@ -2059,7 +2060,7 @@ func_mode_compile ()
|
||||
*.[cCFSifmso] | \
|
||||
*.ada | *.adb | *.ads | *.asm | \
|
||||
*.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
|
||||
*.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
|
||||
*.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
|
||||
func_xform "$libobj"
|
||||
libobj=$func_xform_result
|
||||
;;
|
||||
@@ -3201,11 +3202,13 @@ func_mode_install ()
|
||||
|
||||
# Set up the ranlib parameters.
|
||||
oldlib="$destdir/$name"
|
||||
func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
|
||||
tool_oldlib=$func_to_tool_file_result
|
||||
|
||||
func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
|
||||
|
||||
if test -n "$stripme" && test -n "$old_striplib"; then
|
||||
func_show_eval "$old_striplib $oldlib" 'exit $?'
|
||||
func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
|
||||
fi
|
||||
|
||||
# Do each command in the postinstall commands.
|
||||
@@ -3470,7 +3473,7 @@ static const void *lt_preloaded_setup() {
|
||||
# linked before any other PIC object. But we must not use
|
||||
# pic_flag when linking with -static. The problem exists in
|
||||
# FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
|
||||
*-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
|
||||
*-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
|
||||
pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
|
||||
*-*-hpux*)
|
||||
pic_flag_for_symtable=" $pic_flag" ;;
|
||||
@@ -3982,6 +3985,8 @@ func_exec_program_core ()
|
||||
# launches target application with the remaining arguments.
|
||||
func_exec_program ()
|
||||
{
|
||||
case \" \$* \" in
|
||||
*\\ --lt-*)
|
||||
for lt_wr_arg
|
||||
do
|
||||
case \$lt_wr_arg in
|
||||
@@ -3989,7 +3994,8 @@ func_exec_program ()
|
||||
*) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
done ;;
|
||||
esac
|
||||
func_exec_program_core \${1+\"\$@\"}
|
||||
}
|
||||
|
||||
@@ -5057,9 +5063,15 @@ void lt_dump_script (FILE* f)
|
||||
{
|
||||
EOF
|
||||
func_emit_wrapper yes |
|
||||
$SED -e 's/\([\\"]\)/\\\1/g' \
|
||||
-e 's/^/ fputs ("/' -e 's/$/\\n", f);/'
|
||||
|
||||
$SED -n -e '
|
||||
s/^\(.\{79\}\)\(..*\)/\1\
|
||||
\2/
|
||||
h
|
||||
s/\([\\"]\)/\\\1/g
|
||||
s/$/\\n/
|
||||
s/\([^\n]*\).*/ fputs ("\1", f);/p
|
||||
g
|
||||
D'
|
||||
cat <<"EOF"
|
||||
}
|
||||
EOF
|
||||
@@ -5643,7 +5655,8 @@ func_mode_link ()
|
||||
continue
|
||||
;;
|
||||
|
||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
|
||||
|-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
|
||||
func_append compiler_flags " $arg"
|
||||
func_append compile_command " $arg"
|
||||
func_append finalize_command " $arg"
|
||||
@@ -6147,7 +6160,8 @@ func_mode_link ()
|
||||
lib=
|
||||
found=no
|
||||
case $deplib in
|
||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
|
||||
|-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
|
||||
if test "$linkmode,$pass" = "prog,link"; then
|
||||
compile_deplibs="$deplib $compile_deplibs"
|
||||
finalize_deplibs="$deplib $finalize_deplibs"
|
||||
@@ -6831,7 +6845,7 @@ func_mode_link ()
|
||||
test "$hardcode_direct_absolute" = no; then
|
||||
add="$dir/$linklib"
|
||||
elif test "$hardcode_minus_L" = yes; then
|
||||
add_dir="-L$dir"
|
||||
add_dir="-L$absdir"
|
||||
# Try looking first in the location we're being installed to.
|
||||
if test -n "$inst_prefix_dir"; then
|
||||
case $libdir in
|
||||
@@ -7316,6 +7330,7 @@ func_mode_link ()
|
||||
# which has an extra 1 added just for fun
|
||||
#
|
||||
case $version_type in
|
||||
# correct linux to gnu/linux during the next big refactor
|
||||
darwin|linux|osf|windows|none)
|
||||
func_arith $number_major + $number_minor
|
||||
current=$func_arith_result
|
||||
@@ -7432,7 +7447,7 @@ func_mode_link ()
|
||||
versuffix="$major.$revision"
|
||||
;;
|
||||
|
||||
linux)
|
||||
linux) # correct to gnu/linux during the next big refactor
|
||||
func_arith $current - $age
|
||||
major=.$func_arith_result
|
||||
versuffix="$major.$age.$revision"
|
||||
@@ -8020,6 +8035,11 @@ EOF
|
||||
|
||||
# Test again, we may have decided not to build it any more
|
||||
if test "$build_libtool_libs" = yes; then
|
||||
# Remove ${wl} instances when linking with ld.
|
||||
# FIXME: should test the right _cmds variable.
|
||||
case $archive_cmds in
|
||||
*\$LD\ *) wl= ;;
|
||||
esac
|
||||
if test "$hardcode_into_libs" = yes; then
|
||||
# Hardcode the library paths
|
||||
hardcode_libdirs=
|
||||
@@ -8050,7 +8070,7 @@ EOF
|
||||
elif test -n "$runpath_var"; then
|
||||
case "$perm_rpath " in
|
||||
*" $libdir "*) ;;
|
||||
*) func_apped perm_rpath " $libdir" ;;
|
||||
*) func_append perm_rpath " $libdir" ;;
|
||||
esac
|
||||
fi
|
||||
done
|
||||
@@ -8058,11 +8078,7 @@ EOF
|
||||
if test -n "$hardcode_libdir_separator" &&
|
||||
test -n "$hardcode_libdirs"; then
|
||||
libdir="$hardcode_libdirs"
|
||||
if test -n "$hardcode_libdir_flag_spec_ld"; then
|
||||
eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
|
||||
else
|
||||
eval dep_rpath=\"$hardcode_libdir_flag_spec\"
|
||||
fi
|
||||
eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
|
||||
fi
|
||||
if test -n "$runpath_var" && test -n "$perm_rpath"; then
|
||||
# We should set the runpath_var.
|
||||
@@ -9152,6 +9168,8 @@ EOF
|
||||
esac
|
||||
done
|
||||
fi
|
||||
func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
|
||||
tool_oldlib=$func_to_tool_file_result
|
||||
eval cmds=\"$old_archive_cmds\"
|
||||
|
||||
func_len " $cmds"
|
||||
@@ -9261,7 +9279,8 @@ EOF
|
||||
*.la)
|
||||
func_basename "$deplib"
|
||||
name="$func_basename_result"
|
||||
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
|
||||
func_resolve_sysroot "$deplib"
|
||||
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
|
||||
test -z "$libdir" && \
|
||||
func_fatal_error "\`$deplib' is not a valid libtool archive"
|
||||
func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
|
||||
Executable
+215
@@ -0,0 +1,215 @@
|
||||
#! /bin/sh
|
||||
# Common wrapper for a few potentially missing GNU programs.
|
||||
|
||||
scriptversion=2012-06-26.16; # UTC
|
||||
|
||||
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
|
||||
# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
|
||||
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2, or (at your option)
|
||||
# any later version.
|
||||
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# As a special exception to the GNU General Public License, if you
|
||||
# distribute this file as part of a program that contains a
|
||||
# configuration script generated by Autoconf, you may include it under
|
||||
# the same distribution terms that you use for the rest of that program.
|
||||
|
||||
if test $# -eq 0; then
|
||||
echo 1>&2 "Try '$0 --help' for more information"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
case $1 in
|
||||
|
||||
--is-lightweight)
|
||||
# Used by our autoconf macros to check whether the available missing
|
||||
# script is modern enough.
|
||||
exit 0
|
||||
;;
|
||||
|
||||
--run)
|
||||
# Back-compat with the calling convention used by older automake.
|
||||
shift
|
||||
;;
|
||||
|
||||
-h|--h|--he|--hel|--help)
|
||||
echo "\
|
||||
$0 [OPTION]... PROGRAM [ARGUMENT]...
|
||||
|
||||
Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
|
||||
to PROGRAM being missing or too old.
|
||||
|
||||
Options:
|
||||
-h, --help display this help and exit
|
||||
-v, --version output version information and exit
|
||||
|
||||
Supported PROGRAM values:
|
||||
aclocal autoconf autoheader autom4te automake makeinfo
|
||||
bison yacc flex lex help2man
|
||||
|
||||
Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
|
||||
'g' are ignored when checking the name.
|
||||
|
||||
Send bug reports to <bug-automake@gnu.org>."
|
||||
exit $?
|
||||
;;
|
||||
|
||||
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
|
||||
echo "missing $scriptversion (GNU Automake)"
|
||||
exit $?
|
||||
;;
|
||||
|
||||
-*)
|
||||
echo 1>&2 "$0: unknown '$1' option"
|
||||
echo 1>&2 "Try '$0 --help' for more information"
|
||||
exit 1
|
||||
;;
|
||||
|
||||
esac
|
||||
|
||||
# Run the given program, remember its exit status.
|
||||
"$@"; st=$?
|
||||
|
||||
# If it succeeded, we are done.
|
||||
test $st -eq 0 && exit 0
|
||||
|
||||
# Also exit now if we it failed (or wasn't found), and '--version' was
|
||||
# passed; such an option is passed most likely to detect whether the
|
||||
# program is present and works.
|
||||
case $2 in --version|--help) exit $st;; esac
|
||||
|
||||
# Exit code 63 means version mismatch. This often happens when the user
|
||||
# tries to use an ancient version of a tool on a file that requires a
|
||||
# minimum version.
|
||||
if test $st -eq 63; then
|
||||
msg="probably too old"
|
||||
elif test $st -eq 127; then
|
||||
# Program was missing.
|
||||
msg="missing on your system"
|
||||
else
|
||||
# Program was found and executed, but failed. Give up.
|
||||
exit $st
|
||||
fi
|
||||
|
||||
perl_URL=http://www.perl.org/
|
||||
flex_URL=http://flex.sourceforge.net/
|
||||
gnu_software_URL=http://www.gnu.org/software
|
||||
|
||||
program_details ()
|
||||
{
|
||||
case $1 in
|
||||
aclocal|automake)
|
||||
echo "The '$1' program is part of the GNU Automake package:"
|
||||
echo "<$gnu_software_URL/automake>"
|
||||
echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
|
||||
echo "<$gnu_software_URL/autoconf>"
|
||||
echo "<$gnu_software_URL/m4/>"
|
||||
echo "<$perl_URL>"
|
||||
;;
|
||||
autoconf|autom4te|autoheader)
|
||||
echo "The '$1' program is part of the GNU Autoconf package:"
|
||||
echo "<$gnu_software_URL/autoconf/>"
|
||||
echo "It also requires GNU m4 and Perl in order to run:"
|
||||
echo "<$gnu_software_URL/m4/>"
|
||||
echo "<$perl_URL>"
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
give_advice ()
|
||||
{
|
||||
# Normalize program name to check for.
|
||||
normalized_program=`echo "$1" | sed '
|
||||
s/^gnu-//; t
|
||||
s/^gnu//; t
|
||||
s/^g//; t'`
|
||||
|
||||
printf '%s\n' "'$1' is $msg."
|
||||
|
||||
configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
|
||||
case $normalized_program in
|
||||
autoconf*)
|
||||
echo "You should only need it if you modified 'configure.ac',"
|
||||
echo "or m4 files included by it."
|
||||
program_details 'autoconf'
|
||||
;;
|
||||
autoheader*)
|
||||
echo "You should only need it if you modified 'acconfig.h' or"
|
||||
echo "$configure_deps."
|
||||
program_details 'autoheader'
|
||||
;;
|
||||
automake*)
|
||||
echo "You should only need it if you modified 'Makefile.am' or"
|
||||
echo "$configure_deps."
|
||||
program_details 'automake'
|
||||
;;
|
||||
aclocal*)
|
||||
echo "You should only need it if you modified 'acinclude.m4' or"
|
||||
echo "$configure_deps."
|
||||
program_details 'aclocal'
|
||||
;;
|
||||
autom4te*)
|
||||
echo "You might have modified some maintainer files that require"
|
||||
echo "the 'automa4te' program to be rebuilt."
|
||||
program_details 'autom4te'
|
||||
;;
|
||||
bison*|yacc*)
|
||||
echo "You should only need it if you modified a '.y' file."
|
||||
echo "You may want to install the GNU Bison package:"
|
||||
echo "<$gnu_software_URL/bison/>"
|
||||
;;
|
||||
lex*|flex*)
|
||||
echo "You should only need it if you modified a '.l' file."
|
||||
echo "You may want to install the Fast Lexical Analyzer package:"
|
||||
echo "<$flex_URL>"
|
||||
;;
|
||||
help2man*)
|
||||
echo "You should only need it if you modified a dependency" \
|
||||
"of a man page."
|
||||
echo "You may want to install the GNU Help2man package:"
|
||||
echo "<$gnu_software_URL/help2man/>"
|
||||
;;
|
||||
makeinfo*)
|
||||
echo "You should only need it if you modified a '.texi' file, or"
|
||||
echo "any other file indirectly affecting the aspect of the manual."
|
||||
echo "You might want to install the Texinfo package:"
|
||||
echo "<$gnu_software_URL/texinfo/>"
|
||||
echo "The spurious makeinfo call might also be the consequence of"
|
||||
echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
|
||||
echo "want to install GNU make:"
|
||||
echo "<$gnu_software_URL/make/>"
|
||||
;;
|
||||
*)
|
||||
echo "You might have modified some files without having the proper"
|
||||
echo "tools for further handling them. Check the 'README' file, it"
|
||||
echo "often tells you about the needed prerequisites for installing"
|
||||
echo "this package. You may also peek at any GNU archive site, in"
|
||||
echo "case some other package contains this missing '$1' program."
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
give_advice "$1" | sed -e '1s/^/WARNING: /' \
|
||||
-e '2,$s/^/ /' >&2
|
||||
|
||||
# Propagate the correct exit status (expected to be 127 for a program
|
||||
# not found, 63 for a program that failed due to version mismatch).
|
||||
exit $st
|
||||
|
||||
# Local variables:
|
||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
||||
# time-stamp-start: "scriptversion="
|
||||
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
||||
# time-stamp-time-zone: "UTC"
|
||||
# time-stamp-end: "; # UTC"
|
||||
# End:
|
||||
File diff suppressed because it is too large
Load Diff
@@ -285,16 +285,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'
|
||||
fi
|
||||
else
|
||||
as_ln_s='cp -p'
|
||||
as_ln_s='cp -pR'
|
||||
fi
|
||||
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
|
||||
rmdir conf$$.dir 2>/dev/null
|
||||
@@ -354,28 +354,16 @@ else
|
||||
as_mkdir_p=false
|
||||
fi
|
||||
|
||||
if test -x / >/dev/null 2>&1; then
|
||||
as_test_x='test -x'
|
||||
else
|
||||
if ls -dL / >/dev/null 2>&1; then
|
||||
as_ls_L_option=L
|
||||
else
|
||||
as_ls_L_option=
|
||||
fi
|
||||
as_test_x='
|
||||
eval sh -c '\''
|
||||
if test -d "$1"; then
|
||||
test -d "$1/.";
|
||||
else
|
||||
case $1 in #(
|
||||
-*)set "./$1";;
|
||||
esac;
|
||||
case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
|
||||
???[sx]*):;;*)false;;esac;fi
|
||||
'\'' sh
|
||||
'
|
||||
fi
|
||||
as_executable_p=$as_test_x
|
||||
|
||||
# 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'"
|
||||
@@ -392,8 +380,8 @@ exec 6>&1
|
||||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by mpg123 $as_me 1.13.4, which was
|
||||
generated by GNU Autoconf 2.68. Invocation command line was
|
||||
This file was extended by mpg123 $as_me 1.17.0, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
CONFIG_HEADERS = $CONFIG_HEADERS
|
||||
@@ -439,21 +427,21 @@ $config_commands
|
||||
|
||||
Report bugs to <mpg123-devel@lists.sourceforge.net>."
|
||||
|
||||
ac_cs_config="'--with-default-audio=dummy' '--enable-network=no' '--with-cpu=generic_fpu' '--with-audio=dummy'"
|
||||
ac_cs_config="'--build=86_64-unknown-linux-gnu' '--host=arm-linux-androideabi' '--target=arm-linux-androideabi' '--disable-32bit' 'build_alias=86_64-unknown-linux-gnu' 'host_alias=arm-linux-androideabi' 'target_alias=arm-linux-androideabi' 'CC=arm-linux-androideabi-gcc'"
|
||||
ac_cs_version="\
|
||||
mpg123 config.status 1.13.4
|
||||
configured by ./configure, generated by GNU Autoconf 2.68,
|
||||
mpg123 config.status 1.17.0
|
||||
configured by ./configure, generated by GNU Autoconf 2.69,
|
||||
with options \"$ac_cs_config\"
|
||||
|
||||
Copyright (C) 2010 Free Software Foundation, Inc.
|
||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
This config.status script is free software; the Free Software Foundation
|
||||
gives unlimited permission to copy, distribute and modify it."
|
||||
|
||||
ac_pwd='/home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4'
|
||||
ac_pwd='/home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0'
|
||||
srcdir='.'
|
||||
INSTALL='/usr/bin/install -c'
|
||||
MKDIR_P='/bin/mkdir -p'
|
||||
AWK='gawk'
|
||||
AWK='mawk'
|
||||
test -n "$AWK" || AWK=awk
|
||||
# The default lists apply if the user does not specify any file.
|
||||
ac_need_defaults=:
|
||||
@@ -531,7 +519,7 @@ if $ac_cs_silent; then
|
||||
fi
|
||||
|
||||
if $ac_cs_recheck; then
|
||||
set X '/bin/bash' './configure' '--with-default-audio=dummy' '--enable-network=no' '--with-cpu=generic_fpu' '--with-audio=dummy' $ac_configure_extra_args --no-create --no-recursion
|
||||
set X /bin/bash './configure' '--build=86_64-unknown-linux-gnu' '--host=arm-linux-androideabi' '--target=arm-linux-androideabi' '--disable-32bit' 'build_alias=86_64-unknown-linux-gnu' 'host_alias=arm-linux-androideabi' 'target_alias=arm-linux-androideabi' 'CC=arm-linux-androideabi-gcc' $ac_configure_extra_args --no-create --no-recursion
|
||||
shift
|
||||
$as_echo "running CONFIG_SHELL=/bin/bash $*" >&6
|
||||
CONFIG_SHELL='/bin/bash'
|
||||
@@ -566,25 +554,26 @@ enable_shared='yes'
|
||||
AS='as'
|
||||
DLLTOOL='dlltool'
|
||||
OBJDUMP='objdump'
|
||||
macro_version='2.4'
|
||||
macro_revision='1.3293'
|
||||
macro_version='2.4.2'
|
||||
macro_revision='1.3337'
|
||||
pic_mode='default'
|
||||
enable_fast_install='yes'
|
||||
SHELL='/bin/bash'
|
||||
ECHO='printf %s\n'
|
||||
host_alias=''
|
||||
host='i686-pc-linux-gnu'
|
||||
host_os='linux-gnu'
|
||||
build_alias=''
|
||||
build='i686-pc-linux-gnu'
|
||||
PATH_SEPARATOR=':'
|
||||
host_alias='arm-linux-androideabi'
|
||||
host='arm-unknown-linux-androideabi'
|
||||
host_os='linux-androideabi'
|
||||
build_alias='86_64-unknown-linux-gnu'
|
||||
build='86_64-unknown-linux-gnu'
|
||||
build_os='linux-gnu'
|
||||
SED='/bin/sed'
|
||||
Xsed='/bin/sed -e 1s/^X//'
|
||||
GREP='/bin/grep'
|
||||
EGREP='/bin/grep -E'
|
||||
FGREP='/bin/grep -F'
|
||||
LD='/usr/bin/ld'
|
||||
NM='/usr/bin/nm -B'
|
||||
LD='/opt/android-ndk-r8e/ndk-standalone/arm-linux-androideabi/bin/ld'
|
||||
NM='/opt/android-ndk-r8e/ndk-standalone/bin/arm-linux-androideabi-nm -B'
|
||||
LN_S='ln -s'
|
||||
max_cmd_len='1572864'
|
||||
ac_objext='o'
|
||||
@@ -601,18 +590,18 @@ file_magic_cmd='$MAGIC_CMD'
|
||||
file_magic_glob=''
|
||||
want_nocaseglob='no'
|
||||
sharedlib_from_linklib_cmd='printf %s\n'
|
||||
AR='ar'
|
||||
AR='arm-linux-androideabi-ar'
|
||||
AR_FLAGS='cru'
|
||||
archiver_list_spec='@'
|
||||
STRIP='strip'
|
||||
RANLIB='ranlib'
|
||||
old_postinstall_cmds='chmod 644 $oldlib~$RANLIB $oldlib'
|
||||
STRIP='arm-linux-androideabi-strip'
|
||||
RANLIB='arm-linux-androideabi-ranlib'
|
||||
old_postinstall_cmds='chmod 644 $oldlib~$RANLIB $tool_oldlib'
|
||||
old_postuninstall_cmds=''
|
||||
old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs~$RANLIB $oldlib'
|
||||
old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs~$RANLIB $tool_oldlib'
|
||||
lock_old_archive_extraction='no'
|
||||
CC='gcc'
|
||||
CC='arm-linux-androideabi-gcc'
|
||||
CFLAGS='-O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -g -O2'
|
||||
compiler='gcc'
|
||||
compiler='arm-linux-androideabi-gcc'
|
||||
GCC='yes'
|
||||
lt_cv_sys_global_symbol_pipe='sed -n -e '\''s/^.*[ ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p'\'' | sed '\''/ __gnu_lto/d'\'''
|
||||
lt_cv_sys_global_symbol_to_cdecl='sed -n -e '\''s/^T .* \(.*\)$/extern int \1();/p'\'' -e '\''s/^[ABCDGIRSTW]* .* \(.*\)$/extern char \1;/p'\'''
|
||||
@@ -655,7 +644,6 @@ with_gnu_ld='yes'
|
||||
allow_undefined_flag=''
|
||||
no_undefined_flag=''
|
||||
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
|
||||
hardcode_libdir_flag_spec_ld=''
|
||||
hardcode_libdir_separator=''
|
||||
hardcode_direct='no'
|
||||
hardcode_direct_absolute='no'
|
||||
@@ -687,18 +675,18 @@ postuninstall_cmds=''
|
||||
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
|
||||
finish_eval=''
|
||||
hardcode_into_libs='yes'
|
||||
sys_lib_search_path_spec='/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5.2 /usr/lib/i386-linux-gnu /lib /usr/lib '
|
||||
sys_lib_dlsearch_path_spec='/lib /usr/lib /usr/lib/mesa /lib/i386-linux-gnu /usr/lib/i386-linux-gnu /lib/i686-linux-gnu /usr/lib/i686-linux-gnu /usr/lib/alsa-lib /usr/local/lib '
|
||||
sys_lib_search_path_spec='/opt/android-ndk-r8e/ndk-standalone/lib/gcc/arm-linux-androideabi/4.6 /opt/android-ndk-r8e/ndk-standalone/lib/gcc /opt/android-ndk-r8e/ndk-standalone/arm-linux-androideabi/lib /opt/android-ndk-r8e/ndk-standalone/sysroot/usr/lib '
|
||||
sys_lib_dlsearch_path_spec='/lib /usr/lib /usr/lib/i386-linux-gnu/mesa /lib/i386-linux-gnu /usr/lib/i386-linux-gnu /lib/i686-linux-gnu /usr/lib/i686-linux-gnu /usr/local/lib /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu/mesa-egl /usr/lib/x86_64-linux-gnu/mesa /lib32 /usr/lib32 '
|
||||
hardcode_action='immediate'
|
||||
enable_dlopen='unknown'
|
||||
enable_dlopen_self='unknown'
|
||||
enable_dlopen_self_static='unknown'
|
||||
old_striplib='strip --strip-debug'
|
||||
striplib='strip --strip-unneeded'
|
||||
old_striplib='arm-linux-androideabi-strip --strip-debug'
|
||||
striplib='arm-linux-androideabi-strip --strip-unneeded'
|
||||
|
||||
LTCC='gcc'
|
||||
LTCC='arm-linux-androideabi-gcc'
|
||||
LTCFLAGS='-g -O2'
|
||||
compiler='gcc'
|
||||
compiler='arm-linux-androideabi-gcc'
|
||||
|
||||
# A function that is used when there is no print builtin or printf.
|
||||
func_fallback_echo ()
|
||||
@@ -709,7 +697,7 @@ _LTECHO_EOF'
|
||||
}
|
||||
|
||||
# Quote evaled strings.
|
||||
for var in AS DLLTOOL OBJDUMP SHELL ECHO SED GREP EGREP FGREP LD NM LN_S lt_SP2NL lt_NL2SP reload_flag deplibs_check_method file_magic_cmd file_magic_glob want_nocaseglob sharedlib_from_linklib_cmd AR AR_FLAGS archiver_list_spec STRIP RANLIB CC CFLAGS compiler lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl lt_cv_sys_global_symbol_to_c_name_address lt_cv_sys_global_symbol_to_c_name_address_lib_prefix nm_file_list_spec lt_prog_compiler_no_builtin_flag lt_prog_compiler_pic lt_prog_compiler_wl lt_prog_compiler_static lt_cv_prog_compiler_c_o need_locks MANIFEST_TOOL DSYMUTIL NMEDIT LIPO OTOOL OTOOL64 shrext_cmds export_dynamic_flag_spec whole_archive_flag_spec compiler_needs_object with_gnu_ld allow_undefined_flag no_undefined_flag hardcode_libdir_flag_spec hardcode_libdir_flag_spec_ld hardcode_libdir_separator exclude_expsyms include_expsyms file_list_spec variables_saved_for_relink libname_spec library_names_spec soname_spec install_override_mode finish_eval old_striplib striplib; do
|
||||
for var in AS DLLTOOL OBJDUMP SHELL ECHO PATH_SEPARATOR SED GREP EGREP FGREP LD NM LN_S lt_SP2NL lt_NL2SP reload_flag deplibs_check_method file_magic_cmd file_magic_glob want_nocaseglob sharedlib_from_linklib_cmd AR AR_FLAGS archiver_list_spec STRIP RANLIB CC CFLAGS compiler lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl lt_cv_sys_global_symbol_to_c_name_address lt_cv_sys_global_symbol_to_c_name_address_lib_prefix nm_file_list_spec lt_prog_compiler_no_builtin_flag lt_prog_compiler_pic lt_prog_compiler_wl lt_prog_compiler_static lt_cv_prog_compiler_c_o need_locks MANIFEST_TOOL DSYMUTIL NMEDIT LIPO OTOOL OTOOL64 shrext_cmds export_dynamic_flag_spec whole_archive_flag_spec compiler_needs_object with_gnu_ld allow_undefined_flag no_undefined_flag hardcode_libdir_flag_spec hardcode_libdir_separator exclude_expsyms include_expsyms file_list_spec variables_saved_for_relink libname_spec library_names_spec soname_spec install_override_mode finish_eval old_striplib striplib; do
|
||||
case `eval \\$ECHO \\""\\$$var"\\"` in
|
||||
*[\\\`\"\$]*)
|
||||
eval "lt_$var=\\\"\`\$ECHO \"\$$var\" | \$SED \"\$sed_quote_subst\"\`\\\""
|
||||
@@ -744,7 +732,7 @@ fi
|
||||
|
||||
|
||||
PACKAGE='mpg123'
|
||||
VERSION='1.13.4'
|
||||
VERSION='1.17.0'
|
||||
TIMESTAMP=''
|
||||
RM='rm -f'
|
||||
ofile='libtool'
|
||||
@@ -842,8 +830,8 @@ S["WIN32_CODES_TRUE"]="#"
|
||||
S["OUTPUT_LDFLAGS"]=""
|
||||
S["OUTPUT_LIBS"]=""
|
||||
S["OUTPUT_CFLAGS"]=""
|
||||
S["OUTPUT_MOD"]="dummy"
|
||||
S["OUTPUT_OBJ"]="output/dummy.$(OBJEXT)"
|
||||
S["OUTPUT_MOD"]="oss"
|
||||
S["OUTPUT_OBJ"]="output/oss.$(OBJEXT)"
|
||||
S["HAVE_DUMMY_FALSE"]="#"
|
||||
S["HAVE_DUMMY_TRUE"]=""
|
||||
S["DUMMY_CFLAGS"]=""
|
||||
@@ -868,7 +856,7 @@ S["HAVE_OS2_FALSE"]=""
|
||||
S["HAVE_OS2_TRUE"]="#"
|
||||
S["OS2_CFLAGS"]=""
|
||||
S["OS2_LDFLAGS"]=""
|
||||
S["OS2_LIBS"]=""
|
||||
S["OS2_LIBS"]="-los2me -lmmpm2 -lsocket"
|
||||
S["HAVE_HP_FALSE"]=""
|
||||
S["HAVE_HP_TRUE"]="#"
|
||||
S["HP_CFLAGS"]=""
|
||||
@@ -893,29 +881,34 @@ S["HAVE_NAS_FALSE"]=""
|
||||
S["HAVE_NAS_TRUE"]="#"
|
||||
S["NAS_CFLAGS"]=""
|
||||
S["NAS_LDFLAGS"]=""
|
||||
S["NAS_LIBS"]=""
|
||||
S["HAVE_SDL_FALSE"]=""
|
||||
S["HAVE_SDL_TRUE"]="#"
|
||||
S["NAS_LIBS"]="-laudio"
|
||||
S["HAVE_SDL_FALSE"]="#"
|
||||
S["HAVE_SDL_TRUE"]=""
|
||||
S["SDL_LDFLAGS"]=""
|
||||
S["HAVE_PULSE_FALSE"]=""
|
||||
S["HAVE_PULSE_TRUE"]="#"
|
||||
S["HAVE_PULSE_FALSE"]="#"
|
||||
S["HAVE_PULSE_TRUE"]=""
|
||||
S["PULSE_LDFLAGS"]=""
|
||||
S["HAVE_PORTAUDIO_FALSE"]=""
|
||||
S["HAVE_PORTAUDIO_TRUE"]="#"
|
||||
S["PORTAUDIO_CFLAGS"]=""
|
||||
S["PORTAUDIO_LDFLAGS"]=""
|
||||
S["PORTAUDIO_LIBS"]=""
|
||||
S["PORTAUDIO_LIBS"]="-lportaudio"
|
||||
S["HAVE_JACK_FALSE"]=""
|
||||
S["HAVE_JACK_TRUE"]="#"
|
||||
S["JACK_LDFLAGS"]=""
|
||||
S["HAVE_ESD_FALSE"]=""
|
||||
S["HAVE_ESD_TRUE"]="#"
|
||||
S["ESD_LDFLAGS"]=""
|
||||
S["HAVE_WIN32_WASAPI_FALSE"]=""
|
||||
S["HAVE_WIN32_WASAPI_TRUE"]="#"
|
||||
S["WIN32_WASAPI_CFLAGS"]=""
|
||||
S["WIN32_WASAPI_LDFLAGS"]=""
|
||||
S["WIN32_WASAPI_LIBS"]="-lole32 -lavrt"
|
||||
S["HAVE_WIN32_FALSE"]=""
|
||||
S["HAVE_WIN32_TRUE"]="#"
|
||||
S["WIN32_CFLAGS"]=""
|
||||
S["WIN32_LDFLAGS"]=""
|
||||
S["WIN32_LIBS"]=""
|
||||
S["WIN32_LIBS"]="-lwinmm"
|
||||
S["HAVE_SUN_FALSE"]=""
|
||||
S["HAVE_SUN_TRUE"]="#"
|
||||
S["SUN_CFLAGS"]=""
|
||||
@@ -925,38 +918,53 @@ S["HAVE_SNDIO_FALSE"]=""
|
||||
S["HAVE_SNDIO_TRUE"]="#"
|
||||
S["SNDIO_CFLAGS"]=""
|
||||
S["SNDIO_LDFLAGS"]=""
|
||||
S["SNDIO_LIBS"]=""
|
||||
S["SNDIO_LIBS"]="-lsndio"
|
||||
S["HAVE_COREAUDIO_FALSE"]=""
|
||||
S["HAVE_COREAUDIO_TRUE"]="#"
|
||||
S["COREAUDIO_CFLAGS"]=""
|
||||
S["COREAUDIO_LDFLAGS"]=""
|
||||
S["COREAUDIO_LIBS"]=""
|
||||
S["HAVE_OSS_FALSE"]=""
|
||||
S["HAVE_OSS_TRUE"]="#"
|
||||
S["COREAUDIO_LIBS"]="-framework AudioToolbox -framework AudioUnit -framework CoreServices"
|
||||
S["HAVE_OSS_FALSE"]="#"
|
||||
S["HAVE_OSS_TRUE"]=""
|
||||
S["OSS_CFLAGS"]=""
|
||||
S["OSS_LDFLAGS"]=""
|
||||
S["OSS_LIBS"]=""
|
||||
S["HAVE_QSA_FALSE"]=""
|
||||
S["HAVE_QSA_TRUE"]="#"
|
||||
S["QSA_CFLAGS"]=""
|
||||
S["QSA_LDFLAGS"]=""
|
||||
S["QSA_LIBS"]=""
|
||||
S["HAVE_ALSA_FALSE"]=""
|
||||
S["HAVE_ALSA_TRUE"]="#"
|
||||
S["ALSA_CFLAGS"]=""
|
||||
S["ALSA_LDFLAGS"]=""
|
||||
S["ALSA_LIBS"]=""
|
||||
S["SDL_LIBS"]=""
|
||||
S["SDL_CFLAGS"]=""
|
||||
S["ALSA_LIBS"]="-lasound"
|
||||
S["HAVE_TINYALSA_FALSE"]=""
|
||||
S["HAVE_TINYALSA_TRUE"]="#"
|
||||
S["TINYALSA_CFLAGS"]=""
|
||||
S["TINYALSA_LDFLAGS"]=""
|
||||
S["TINYALSA_LIBS"]="-ltinyalsa"
|
||||
S["SDL_LIBS"]="-lSDL "
|
||||
S["SDL_CFLAGS"]="-D_GNU_SOURCE=1 -D_REENTRANT -I/usr/include/SDL "
|
||||
S["ESD_LIBS"]=""
|
||||
S["ESD_CFLAGS"]=""
|
||||
S["PULSE_LIBS"]=""
|
||||
S["PULSE_CFLAGS"]=""
|
||||
S["PULSE_LIBS"]="-lpulse-simple -lpulse "
|
||||
S["PULSE_CFLAGS"]="-D_REENTRANT "
|
||||
S["JACK_LIBS"]=""
|
||||
S["JACK_CFLAGS"]=""
|
||||
S["PKG_CONFIG"]="/usr/bin/pkg-config"
|
||||
S["DECODER_LOBJ"]=" stringbuf.lo icy.lo icy2utf8.lo ntom.lo synth.lo synth_8bit.lo layer1.lo layer2.lo layer3.lo synth_s32.lo synth_real.lo feature.lo"
|
||||
S["DECODER_LOBJ"]=" stringbuf.lo icy.lo icy2utf8.lo ntom.lo synth.lo synth_8bit.lo layer1.lo layer2.lo layer3.lo synth_arm.lo feature.lo"
|
||||
S["DECODER_OBJ"]=" stringbuf.$(OBJEXT) icy.$(OBJEXT) icy2utf8.$(OBJEXT) ntom.$(OBJEXT) synth.$(OBJEXT) synth_8bit.$(OBJEXT) layer1.$(OBJEXT) layer2.$(OBJEXT) layer3.$"\
|
||||
"(OBJEXT) synth_s32.$(OBJEXT) synth_real.$(OBJEXT) feature.$(OBJEXT)"
|
||||
"(OBJEXT) synth_arm.$(OBJEXT) feature.$(OBJEXT)"
|
||||
S["YASM_FORMAT"]=""
|
||||
S["USE_YASM_FOR_AVX_FALSE"]=""
|
||||
S["USE_YASM_FOR_AVX_TRUE"]="#"
|
||||
S["INCLUDE_SYS_TYPE_H"]="#include <sys/types.h>"
|
||||
S["INCLUDE_STDLIB_H"]="#include <stdlib.h>"
|
||||
S["INCLUDE_STDIO_H"]="#include <stdio.h>"
|
||||
S["LFS_LOBJ"]="lfs_wrap.lo lfs_alias.lo"
|
||||
S["LFS_LOBJ"]=" lfs_alias.lo"
|
||||
S["YASMFLAGS"]="-pgas -rgas -mamd64"
|
||||
S["YASM"]="yasm"
|
||||
S["EXEC_LT_LDFLAGS"]=""
|
||||
S["LT_LDFLAGS"]="-export-dynamic"
|
||||
S["MODULE_OBJ"]="legacy_module.$(OBJEXT)"
|
||||
@@ -968,14 +976,14 @@ S["LIPO"]=""
|
||||
S["NMEDIT"]=""
|
||||
S["DSYMUTIL"]=""
|
||||
S["MANIFEST_TOOL"]=":"
|
||||
S["RANLIB"]="ranlib"
|
||||
S["ac_ct_AR"]="ar"
|
||||
S["AR"]="ar"
|
||||
S["RANLIB"]="arm-linux-androideabi-ranlib"
|
||||
S["ac_ct_AR"]=""
|
||||
S["AR"]="arm-linux-androideabi-ar"
|
||||
S["LN_S"]="ln -s"
|
||||
S["NM"]="/usr/bin/nm -B"
|
||||
S["NM"]="/opt/android-ndk-r8e/ndk-standalone/bin/arm-linux-androideabi-nm -B"
|
||||
S["ac_ct_DUMPBIN"]=""
|
||||
S["DUMPBIN"]=""
|
||||
S["LD"]="/usr/bin/ld"
|
||||
S["LD"]="/opt/android-ndk-r8e/ndk-standalone/arm-linux-androideabi/bin/ld"
|
||||
S["FGREP"]="/bin/grep -F"
|
||||
S["SED"]="/bin/sed"
|
||||
S["LIBTOOL"]="$(SHELL) $(top_builddir)/libtool"
|
||||
@@ -984,15 +992,16 @@ S["DLLTOOL"]="dlltool"
|
||||
S["AS"]="as"
|
||||
S["EGREP"]="/bin/grep -E"
|
||||
S["GREP"]="/bin/grep"
|
||||
S["CPP"]="gcc -E"
|
||||
S["CPP"]="arm-linux-androideabi-gcc -E"
|
||||
S["am__fastdepCCAS_FALSE"]="#"
|
||||
S["am__fastdepCCAS_TRUE"]=""
|
||||
S["CCASDEPMODE"]="depmode=gcc3"
|
||||
S["CCASFLAGS"]="-g -O2"
|
||||
S["CCAS"]="gcc"
|
||||
S["CCAS"]="arm-linux-androideabi-gcc"
|
||||
S["am__fastdepCC_FALSE"]="#"
|
||||
S["am__fastdepCC_TRUE"]=""
|
||||
S["CCDEPMODE"]="depmode=gcc3"
|
||||
S["am__nodep"]="_no"
|
||||
S["AMDEPBACKSLASH"]="\\"
|
||||
S["AMDEP_FALSE"]="#"
|
||||
S["AMDEP_TRUE"]=""
|
||||
@@ -1001,47 +1010,51 @@ S["am__include"]="include"
|
||||
S["DEPDIR"]=".deps"
|
||||
S["OBJEXT"]="o"
|
||||
S["EXEEXT"]=""
|
||||
S["ac_ct_CC"]="gcc"
|
||||
S["CPPFLAGS"]=" -DOPT_GENERIC -DREAL_IS_FLOAT "
|
||||
S["ac_ct_CC"]=""
|
||||
S["CPPFLAGS"]=" -DOPT_ARM -DREAL_IS_FIXED "
|
||||
S["LDFLAGS"]=" "
|
||||
S["CFLAGS"]="-O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -g -O2"
|
||||
S["CC"]="gcc"
|
||||
S["am__untar"]="${AMTAR} xf -"
|
||||
S["am__tar"]="${AMTAR} chof - \"$$tardir\""
|
||||
S["AMTAR"]="${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run tar"
|
||||
S["CC"]="arm-linux-androideabi-gcc"
|
||||
S["AM_BACKSLASH"]="\\"
|
||||
S["AM_DEFAULT_VERBOSITY"]="1"
|
||||
S["AM_DEFAULT_V"]="$(AM_DEFAULT_VERBOSITY)"
|
||||
S["AM_V"]="$(V)"
|
||||
S["am__untar"]="$${TAR-tar} xf -"
|
||||
S["am__tar"]="$${TAR-tar} chof - \"$$tardir\""
|
||||
S["AMTAR"]="$${TAR-tar}"
|
||||
S["am__leading_dot"]="."
|
||||
S["SET_MAKE"]=""
|
||||
S["AWK"]="gawk"
|
||||
S["mkdir_p"]="/bin/mkdir -p"
|
||||
S["AWK"]="mawk"
|
||||
S["mkdir_p"]="$(MKDIR_P)"
|
||||
S["MKDIR_P"]="/bin/mkdir -p"
|
||||
S["INSTALL_STRIP_PROGRAM"]="$(install_sh) -c -s"
|
||||
S["STRIP"]="strip"
|
||||
S["install_sh"]="${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/install-sh"
|
||||
S["MAKEINFO"]="${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run makeinfo"
|
||||
S["AUTOHEADER"]="${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run autoheader"
|
||||
S["AUTOMAKE"]="${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run automake-1.11"
|
||||
S["AUTOCONF"]="${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run autoconf"
|
||||
S["ACLOCAL"]="${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run aclocal-1.11"
|
||||
S["VERSION"]="1.13.4"
|
||||
S["STRIP"]="arm-linux-androideabi-strip"
|
||||
S["install_sh"]="${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/install-sh"
|
||||
S["MAKEINFO"]="${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing makeinfo"
|
||||
S["AUTOHEADER"]="${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing autoheader"
|
||||
S["AUTOMAKE"]="${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing automake-1.14"
|
||||
S["AUTOCONF"]="${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing autoconf"
|
||||
S["ACLOCAL"]="${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing aclocal-1.14"
|
||||
S["VERSION"]="1.17.0"
|
||||
S["PACKAGE"]="mpg123"
|
||||
S["CYGPATH_W"]="echo"
|
||||
S["am__isrc"]=""
|
||||
S["INSTALL_DATA"]="${INSTALL} -m 644"
|
||||
S["INSTALL_SCRIPT"]="${INSTALL}"
|
||||
S["INSTALL_PROGRAM"]="${INSTALL}"
|
||||
S["host_os"]="linux-gnu"
|
||||
S["host_vendor"]="pc"
|
||||
S["host_cpu"]="i686"
|
||||
S["host"]="i686-pc-linux-gnu"
|
||||
S["host_os"]="linux-androideabi"
|
||||
S["host_vendor"]="unknown"
|
||||
S["host_cpu"]="arm"
|
||||
S["host"]="arm-unknown-linux-androideabi"
|
||||
S["build_os"]="linux-gnu"
|
||||
S["build_vendor"]="pc"
|
||||
S["build_cpu"]="i686"
|
||||
S["build"]="i686-pc-linux-gnu"
|
||||
S["API_VERSION"]="29"
|
||||
S["LIBMPG123_VERSION"]="29:6:29"
|
||||
S["target_alias"]=""
|
||||
S["host_alias"]=""
|
||||
S["build_alias"]=""
|
||||
S["build_vendor"]="unknown"
|
||||
S["build_cpu"]="86_64"
|
||||
S["build"]="86_64-unknown-linux-gnu"
|
||||
S["API_VERSION"]="38"
|
||||
S["LIBMPG123_VERSION"]="38:4:38"
|
||||
S["target_alias"]="arm-linux-androideabi"
|
||||
S["host_alias"]="arm-linux-androideabi"
|
||||
S["build_alias"]="86_64-unknown-linux-gnu"
|
||||
S["LIBS"]="-lm "
|
||||
S["ECHO_T"]=""
|
||||
S["ECHO_N"]="-n"
|
||||
@@ -1071,8 +1084,8 @@ S["prefix"]="/usr/local"
|
||||
S["exec_prefix"]="${prefix}"
|
||||
S["PACKAGE_URL"]=""
|
||||
S["PACKAGE_BUGREPORT"]="mpg123-devel@lists.sourceforge.net"
|
||||
S["PACKAGE_STRING"]="mpg123 1.13.4"
|
||||
S["PACKAGE_VERSION"]="1.13.4"
|
||||
S["PACKAGE_STRING"]="mpg123 1.17.0"
|
||||
S["PACKAGE_VERSION"]="1.17.0"
|
||||
S["PACKAGE_TARNAME"]="mpg123"
|
||||
S["PACKAGE_NAME"]="mpg123"
|
||||
S["PATH_SEPARATOR"]=":"
|
||||
@@ -1120,12 +1133,12 @@ cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
|
||||
BEGIN {
|
||||
D["PACKAGE_NAME"]=" \"mpg123\""
|
||||
D["PACKAGE_TARNAME"]=" \"mpg123\""
|
||||
D["PACKAGE_VERSION"]=" \"1.13.4\""
|
||||
D["PACKAGE_STRING"]=" \"mpg123 1.13.4\""
|
||||
D["PACKAGE_VERSION"]=" \"1.17.0\""
|
||||
D["PACKAGE_STRING"]=" \"mpg123 1.17.0\""
|
||||
D["PACKAGE_BUGREPORT"]=" \"mpg123-devel@lists.sourceforge.net\""
|
||||
D["PACKAGE_URL"]=" \"\""
|
||||
D["PACKAGE"]=" \"mpg123\""
|
||||
D["VERSION"]=" \"1.13.4\""
|
||||
D["VERSION"]=" \"1.17.0\""
|
||||
D["STDC_HEADERS"]=" 1"
|
||||
D["HAVE_SYS_TYPES_H"]=" 1"
|
||||
D["HAVE_SYS_STAT_H"]=" 1"
|
||||
@@ -1140,8 +1153,11 @@ D["DYNAMIC_BUILD"]=" 1"
|
||||
D["HAVE_DLFCN_H"]=" 1"
|
||||
D["LT_OBJDIR"]=" \".libs/\""
|
||||
D["GAPLESS"]=" 1"
|
||||
D["IEEE_FLOAT"]=" 1"
|
||||
D["USE_NEW_HUFFTABLE"]=" 1"
|
||||
D["NO_32BIT"]=" 1"
|
||||
D["NO_REAL"]=" 1"
|
||||
D["MODULE_FILE_SUFFIX"]=" \".la\""
|
||||
D["ASMALIGN_BALIGN"]=" 1"
|
||||
D["STDC_HEADERS"]=" 1"
|
||||
D["HAVE_STDIO_H"]=" 1"
|
||||
D["HAVE_STDLIB_H"]=" 1"
|
||||
@@ -1156,47 +1172,39 @@ D["HAVE_INTTYPES_H"]=" 1"
|
||||
D["HAVE_SYS_TIME_H"]=" 1"
|
||||
D["HAVE_SYS_WAIT_H"]=" 1"
|
||||
D["HAVE_SYS_RESOURCE_H"]=" 1"
|
||||
D["HAVE_SYS_SIGNAL_H"]=" 1"
|
||||
D["HAVE_SIGNAL_H"]=" 1"
|
||||
D["_FILE_OFFSET_BITS"]=" 64"
|
||||
D["SIZEOF_SIZE_T"]=" 4"
|
||||
D["SIZEOF_SSIZE_T"]=" 4"
|
||||
D["SIZEOF_OFF_T"]=" 8"
|
||||
D["SIZEOF_OFF_T"]=" 4"
|
||||
D["SIZEOF_INT32_T"]=" 4"
|
||||
D["SIZEOF_LONG"]=" 4"
|
||||
D["lfs_alias_t"]=" off_t"
|
||||
D["LFS_ALIAS_BITS"]=" 32"
|
||||
D["HAVE_STDLIB_H"]=" 1"
|
||||
D["HAVE_UNISTD_H"]=" 1"
|
||||
D["HAVE_SYS_PARAM_H"]=" 1"
|
||||
D["HAVE_GETPAGESIZE"]=" 1"
|
||||
D["HAVE_MMAP"]=" 1"
|
||||
D["HAVE_TERMIOS"]=" 1"
|
||||
D["HAVE_RANDOM"]=" 1"
|
||||
D["HAVE_SCHED_SETSCHEDULER"]=" 1"
|
||||
D["HAVE_SETUID"]=" 1"
|
||||
D["HAVE_GETUID"]=" 1"
|
||||
D["HAVE_SETPRIORITY"]=" 1"
|
||||
D["HAVE_STRERROR"]=" 1"
|
||||
D["HAVE_SETLOCALE"]=" 1"
|
||||
D["HAVE_NL_LANGINFO"]=" 1"
|
||||
D["HAVE_STRDUP"]=" 1"
|
||||
D["HAVE_ATOLL"]=" 1"
|
||||
D["HAVE_MKFIFO"]=" 1"
|
||||
D["FIFO"]=" 1"
|
||||
D["HAVE_LOCALE_H"]=" 1"
|
||||
D["HAVE_LANGINFO_H"]=" 1"
|
||||
D["HAVE_NETDB_H"]=" 1"
|
||||
D["HAVE_SYS_PARAM_H"]=" 1"
|
||||
D["HAVE_SYS_SOCKET_H"]=" 1"
|
||||
D["HAVE_NETINET_IN_H"]=" 1"
|
||||
D["HAVE_ARPA_INET_H"]=" 1"
|
||||
D["HAVE_GETADDRINFO"]=" 1"
|
||||
D["HAVE_GAI_ADDRCONFIG"]=" 1"
|
||||
D["HAVE_LIBM"]=" 1"
|
||||
D["ABI_ALIGN_FUN"]=" 1"
|
||||
D["DEFAULT_OUTPUT_MODULE"]=" \"dummy\""
|
||||
D["HAVE_LINUX_SOUNDCARD_H"]=" 1"
|
||||
D["DEFAULT_OUTPUT_MODULE"]=" \"oss\""
|
||||
D["FRAME_INDEX"]=" 1"
|
||||
D["INDEX_SIZE"]=" 1000"
|
||||
D["NETWORK"]=" 1"
|
||||
D["IPV6"]=" 1"
|
||||
for (key in D) D_is_set[key] = 1
|
||||
FS = ""
|
||||
@@ -1522,7 +1530,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
|
||||
@@ -1535,7 +1543,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.
|
||||
@@ -1569,21 +1577,19 @@ $as_echo X"$mf" |
|
||||
continue
|
||||
fi
|
||||
# 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" ||
|
||||
@@ -1637,8 +1643,8 @@ $as_echo X"$file" |
|
||||
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
|
||||
#
|
||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
|
||||
# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
|
||||
# Inc.
|
||||
# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
|
||||
# Foundation, Inc.
|
||||
# Written by Gordon Matzigkeit, 1996
|
||||
#
|
||||
# This file is part of GNU Libtool.
|
||||
@@ -1701,6 +1707,9 @@ SHELL=$lt_SHELL
|
||||
# An echo program that protects backslashes.
|
||||
ECHO=$lt_ECHO
|
||||
|
||||
# The PATH separator for the build system.
|
||||
PATH_SEPARATOR=$lt_PATH_SEPARATOR
|
||||
|
||||
# The host system.
|
||||
host_alias=$host_alias
|
||||
host=$host
|
||||
@@ -1996,10 +2005,6 @@ no_undefined_flag=$lt_no_undefined_flag
|
||||
# This must work even if \$libdir does not exist
|
||||
hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
|
||||
|
||||
# If ld is used when linking, flag to hardcode \$libdir into a binary
|
||||
# during linking. This must work even if \$libdir does not exist.
|
||||
hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
|
||||
|
||||
# Whether we need a single "-rpath" flag with a separated argument.
|
||||
hardcode_libdir_separator=$lt_hardcode_libdir_separator
|
||||
|
||||
+1351
-360
File diff suppressed because it is too large
Load Diff
@@ -7,12 +7,11 @@ dnl initially written by Nicholas J. Humfrey
|
||||
dnl Require autoconf version >= 2.57
|
||||
AC_PREREQ(2.57)
|
||||
|
||||
|
||||
dnl ############# Initialisation
|
||||
AC_INIT([mpg123], [1.13.4], [mpg123-devel@lists.sourceforge.net])
|
||||
AC_INIT([mpg123], [1.17.0], [mpg123-devel@lists.sourceforge.net])
|
||||
dnl Increment API_VERSION when the API gets changes (new functions).
|
||||
API_VERSION=29
|
||||
LIB_PATCHLEVEL=6
|
||||
API_VERSION=38
|
||||
LIB_PATCHLEVEL=4
|
||||
dnl Since we want to be backwards compatible, both sides get set to API_VERSION.
|
||||
LIBMPG123_VERSION=$API_VERSION:$LIB_PATCHLEVEL:$API_VERSION
|
||||
AC_SUBST(LIBMPG123_VERSION)
|
||||
@@ -26,7 +25,7 @@ AC_CANONICAL_HOST
|
||||
|
||||
dnl Version 1.7 of automake is recommended
|
||||
AM_INIT_AUTOMAKE(1.7)
|
||||
AM_CONFIG_HEADER(src/config.h)
|
||||
AC_CONFIG_HEADERS([src/config.h])
|
||||
|
||||
|
||||
# You get strange symptoms like jack module build failing because the AC_C_CONST failed to detect the working const support.
|
||||
@@ -35,10 +34,11 @@ AM_CONFIG_HEADER(src/config.h)
|
||||
AC_MSG_CHECKING([for -Werror in CFLAGS (It breaks tests)])
|
||||
if echo "$CFLAGS" | grep Werror; then
|
||||
AC_MSG_RESULT([yes])
|
||||
AC_MSG_ERROR([I refuse to run with -Werror in CFLAGS. That breaks tests and makes this configure bogus.
|
||||
AC_MSG_WARN([You have -Werror in CFLAGS. That may break some tests and make this configure bogus.
|
||||
If you want paranoid compilation, use --enable-nagging option, which adds -Werror for gcc.
|
||||
Also note that you shall not run make distcheck after configuring with --enable-nagging.
|
||||
distcheck uses the generated CFLAGS...])
|
||||
distcheck uses the generated CFLAGS...
|
||||
Anyhow, continuing at your own risk.])
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
@@ -382,10 +382,24 @@ AC_ARG_ENABLE(messages,
|
||||
|
||||
if test "x$messages" = "xdisabled"; then
|
||||
AC_DEFINE(NO_WARNING, 1, [ Define to disable warning messages. ])
|
||||
AC_DEFINE(NO_ERROR, 1, [ Define to disable error messages. ])
|
||||
AC_DEFINE(NO_ERRORMSG, 1, [ Define to disable error messages. ])
|
||||
AC_DEFINE(NO_ERETURN, 1, [ Define to disable error messages in combination with a return value (the return is left intact). ])
|
||||
fi
|
||||
|
||||
newhuff=enabled
|
||||
AC_ARG_ENABLE(new-huffman,
|
||||
[ --enable-new-huffman=[yes/no] use new huffman decoding scheme by Taihei (faster on modern CPUs at least, so on by default) ],
|
||||
[
|
||||
if test "x$enableval" = xno; then
|
||||
newhuff=disabled
|
||||
fi
|
||||
]
|
||||
, [])
|
||||
|
||||
if test "x$newhuff" = "xenabled"; then
|
||||
AC_DEFINE(USE_NEW_HUFFTABLE, 1, [ Define for new Huffman decoding scheme. ])
|
||||
fi
|
||||
|
||||
integers=fast
|
||||
AC_ARG_ENABLE(int-quality,
|
||||
[ --enable-int-quality=[yes/no] use rounding instead of fast truncation for integer output, where possible ],
|
||||
@@ -443,14 +457,18 @@ AC_ARG_WITH([cpu], [
|
||||
--with-cpu=i586 Use code optimized for i586 processors
|
||||
--with-cpu=i586_dither Use code optimized for i586 processors with dithering (noise shaping), adds 256K to binary size
|
||||
--with-cpu=3dnow Use code optimized for 3DNow processors
|
||||
--with-cpu=3dnow_vintage Use code optimized for older 3DNow processors (K6 family)
|
||||
--with-cpu=3dnowext Use code optimized for 3DNowExt processors (K6-3+, Athlon)
|
||||
--with-cpu=3dnowext_alone Really only 3DNowExt decoder, without 3DNow fallback for flexible rate
|
||||
--with-cpu=3dnow_vintage Use code optimized for older extended 3DNow processors (like K6-III+)
|
||||
--with-cpu=mmx Use code optimized for MMX processors
|
||||
--with-cpu=mmx_alone Really only MMX decoder, without i586 fallback for flexible rate
|
||||
--with-cpu=sse Use code optimized for SSE processors
|
||||
--with-cpu=sse_vintage Use code optimized for older SSE processors (plain C DCT36)
|
||||
--with-cpu=sse_alone Really only SSE decoder, without i586 fallback for flexible rate
|
||||
--with-cpu=avx Use code optimized for x86-64 with AVX processors
|
||||
--with-cpu=x86 Pack all x86 opts into one binary (excluding i486, including dither)
|
||||
--with-cpu=x86-64 Use code optimized for x86-64 processors (AMD64 and Intel64, including dithered generic)
|
||||
--with-cpu=x86-64 Use code optimized for x86-64 processors (AMD64 and Intel64, including AVX and dithered generic)
|
||||
--with-cpu=altivec Use code optimized for Altivec processors (PowerPC G4 and G5)
|
||||
--with-cpu=ppc_nofpu Use code optimized for PowerPC processors with fixed point arithmetic (experimental)
|
||||
--with-cpu=neon Use code optimized for ARM NEON SIMD engine (Cortex-A series)
|
||||
@@ -472,7 +490,7 @@ if test "x$ieee" = xyes; then
|
||||
AC_DEFINE(IEEE_FLOAT, 1, [ Define to indicate that float storage follows IEEE754. ])
|
||||
fi
|
||||
|
||||
|
||||
newoldwritesample=disabled
|
||||
case $host in
|
||||
arm*-*-linux*)
|
||||
# check that... perhaps we are better off on arm with kernel math emulation
|
||||
@@ -480,18 +498,22 @@ case $host in
|
||||
;;
|
||||
i386-*-linux*|i386-*-kfreebsd*-gnu)
|
||||
cpu_type="i386_fpu"
|
||||
newoldwritesample=enabled
|
||||
;;
|
||||
i486-*-linux*|i486-*-kfreebsd*-gnu)
|
||||
cpu_type="i486"
|
||||
newoldwritesample=enabled
|
||||
;;
|
||||
i586-*-linux*|i586-*-kfreebsd*-gnu)
|
||||
cpu_type="x86"
|
||||
newoldwritesample=enabled
|
||||
;;
|
||||
i686-*-linux*|i686-*-kfreebsd*-gnu)
|
||||
cpu_type="x86"
|
||||
newoldwritesample=enabled
|
||||
;;
|
||||
x86_64-*-linux*|x86_64-*-kfreebsd*-gnu)
|
||||
cpu_type="x86-64_all"
|
||||
cpu_type="x86-64"
|
||||
;;
|
||||
*-*-linux*|*-*-kfreebsd*-gnu)
|
||||
cpu_type="generic_fpu"
|
||||
@@ -501,19 +523,21 @@ case $host in
|
||||
case `sysctl -n hw.optional.x86_64` in
|
||||
1)
|
||||
AC_MSG_RESULT([yes])
|
||||
cpu_type="x86-64_all"
|
||||
cpu_type="x86-64"
|
||||
;;
|
||||
*)
|
||||
AC_MSG_RESULT([no])
|
||||
cpu_type="x86"
|
||||
newoldwritesample=enabled
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
i386-apple-darwin*)
|
||||
cpu_type="x86"
|
||||
newoldwritesample=enabled
|
||||
;;
|
||||
x86_64-apple-darwin*)
|
||||
cpu_type="x86-64_all"
|
||||
cpu_type="x86-64"
|
||||
;;
|
||||
*-apple-darwin*)
|
||||
AC_MSG_CHECKING([if CPU type supports AltiVec])
|
||||
@@ -530,18 +554,20 @@ case $host in
|
||||
;;
|
||||
i?86-*-dragonfly* | i?86-*-freebsd* | i?86-*-midnightbsd* | i?86-*-mirbsd* | i?86-*-netbsd* | i?86-*-openbsd*)
|
||||
cpu_type="x86"
|
||||
newoldwritesample=enabled
|
||||
;;
|
||||
x86_64-*-dragonfly* | x86_64-*-freebsd* | x86_64-*-midnightbsd* | x86_64-*-mirbsd* | x86_64-*-netbsd* | x86_64-*-openbsd*)
|
||||
cpu_type="x86-64_all"
|
||||
cpu_type="x86-64"
|
||||
;;
|
||||
*-*-dragonfly* | *-*-freebsd* | *-*-midnightbsd* | *-*-mirbsd* | *-*-netbsd* | *-*-openbsd*)
|
||||
cpu_type="generic_fpu"
|
||||
;;
|
||||
i386-*-solaris*)
|
||||
cpu_type=x86
|
||||
newoldwritesample=enabled
|
||||
;;
|
||||
x86_64-*-solaris*)
|
||||
cpu_type=x86-64_all
|
||||
cpu_type=x86-64
|
||||
;;
|
||||
*-*-solaris*)
|
||||
cpu_type="generic_fpu"
|
||||
@@ -550,6 +576,7 @@ case $host in
|
||||
# Till we sorted out the assembler troubles, generic CPU is default.
|
||||
i386-pc-os2-emx)
|
||||
cpu_type=generic_fpu
|
||||
newoldwritesample=enabled
|
||||
;;
|
||||
x86_64-pc-os2-emx)
|
||||
# We are optimistic hat the future knows OS/2 on x86-64;-)
|
||||
@@ -561,61 +588,74 @@ case $host in
|
||||
*-dec-osf*)
|
||||
cpu_type="generic_fpu"
|
||||
;;
|
||||
x86_64-pc-cygwin*)
|
||||
cpu_type="x86-64_all"
|
||||
x86_64-*-cygwin*)
|
||||
cpu_type="x86-64"
|
||||
;;
|
||||
i686-pc-cygwin*)
|
||||
i686-*-cygwin*)
|
||||
cpu_type="x86"
|
||||
newoldwritesample=enabled
|
||||
;;
|
||||
i586-pc-cygwin*)
|
||||
i586-*-cygwin*)
|
||||
cpu_type="x86"
|
||||
newoldwritesample=enabled
|
||||
;;
|
||||
i486-pc-cygwin*)
|
||||
i486-*-cygwin*)
|
||||
cpu_type="i486"
|
||||
newoldwritesample=enabled
|
||||
;;
|
||||
i386-pc-cygwin*)
|
||||
i386-*-cygwin*)
|
||||
cpu_type="i386"
|
||||
newoldwritesample=enabled
|
||||
;;
|
||||
*-pc-cygwin*)
|
||||
*-cygwin*)
|
||||
cpu_type="generic_fpu"
|
||||
;;
|
||||
i@<:@3-7@:>@86-*-mingw32*)
|
||||
LIBS="$LIBS"
|
||||
buffer=disabled
|
||||
cpu_type="x86"
|
||||
newoldwritesample=enabled
|
||||
;;
|
||||
x86_64-*-mingw32*)
|
||||
LIBS="$LIBS"
|
||||
buffer=disabled
|
||||
cpu_type="x86-64"
|
||||
;;
|
||||
i386-*-nto-qnx*)
|
||||
cpu_type="x86"
|
||||
newoldwritesample=enabled
|
||||
;;
|
||||
i386-*)
|
||||
AC_MSG_WARN([Unknown host operating system])
|
||||
cpu_type="i386"
|
||||
buffer=disabled
|
||||
ADD_CPPFLAGS="-DGENERIC $ADD_CPPFLAGS"
|
||||
newoldwritesample=enabled
|
||||
;;
|
||||
i486-*)
|
||||
AC_MSG_WARN([Unknown host operating system])
|
||||
cpu_type="i486"
|
||||
buffer=disabled
|
||||
ADD_CPPFLAGS="-DGENERIC $ADD_CPPFLAGS"
|
||||
newoldwritesample=enabled
|
||||
;;
|
||||
i586-*)
|
||||
AC_MSG_WARN([Unknown host operating system])
|
||||
cpu_type="x86"
|
||||
buffer=disabled
|
||||
ADD_CPPFLAGS="-DGENERIC $ADD_CPPFLAGS"
|
||||
newoldwritesample=enabled
|
||||
;;
|
||||
i686-*)
|
||||
AC_MSG_WARN([Unknown host operating system])
|
||||
cpu_type="x86"
|
||||
buffer=disabled
|
||||
ADD_CPPFLAGS="-DGENERIC $ADD_CPPFLAGS"
|
||||
newoldwritesample=enabled
|
||||
;;
|
||||
x86_64-*)
|
||||
AC_MSG_WARN([Unknown host operating system])
|
||||
cpu_type="x86-64_all"
|
||||
cpu_type="x86-64"
|
||||
buffer=disabled
|
||||
ADD_CPPFLAGS="-DGENERIC $ADD_CPPFLAGS"
|
||||
;;
|
||||
@@ -641,6 +681,17 @@ AC_ARG_ENABLE(buffer,
|
||||
]
|
||||
)
|
||||
|
||||
AC_ARG_ENABLE(newoldwritesample,
|
||||
[ --enable-newoldwritesample=[no/yes] enable new/old WRITE_SAMPLE macro for non-accurate 16 bit output, faster on certain CPUs (default on on x86-32)],
|
||||
[
|
||||
if test "x$enableval" = xyes
|
||||
then
|
||||
newoldwritesample=enabled
|
||||
else
|
||||
newoldwritesample=disabled
|
||||
fi
|
||||
])
|
||||
|
||||
dnl Did user choose other CPU type ?
|
||||
if test "x$with_cpu" != "x"; then
|
||||
cpu_type=$with_cpu
|
||||
@@ -756,7 +807,8 @@ AC_ARG_WITH([audio], [
|
||||
AC_ARG_WITH([default-audio], [
|
||||
--with-default-audio=aix Use AIX as default audio output sub-system
|
||||
--with-default-audio=alib Use Alib as default audio output sub-system (for HPUX)
|
||||
--with-default-audio=alsa Use ALSA as default audio output sub-system
|
||||
--with-default-audio=alsa Use ALSA as default audio output sub-system (libasound)
|
||||
--with-default-audio=tinyalsa Use ALSA as default audio output sub-system (tinyalsa)
|
||||
--with-default-audio=arts Use aRts as default audio output sub-system (KDE sound server)
|
||||
--with-default-audio=dummy Use dummy as default audio (when no sound card is available)
|
||||
--with-default-audio=esd Use ESoundD as default audio output sub-system
|
||||
@@ -769,11 +821,13 @@ AC_ARG_WITH([default-audio], [
|
||||
--with-default-audio=oss Use OSS as default audio output sub-system (/dev/dsp)
|
||||
--with-default-audio=portaudio Use PortAudio as default audio output sub-system
|
||||
--with-default-audio=pulse Use Pulse audio server as default audio output sub-system
|
||||
--with-default-audio=qsa Use QSA as default audio output sub-system
|
||||
--with-default-audio=sdl Use SDL as default audio output sub-system (Simple DirectMedia Layer)
|
||||
--with-default-audio=sgi Use SGI as default audio output sub-system (IRIX)
|
||||
--with-default-audio=sndio Use OpenBSD's sndio as default audio output sub-system
|
||||
--with-default-audio=sun Use Sun as default audio output sub-system (/dev/audio)
|
||||
--with-default-audio=win32 Use Win32 audio as default audio output sub-system
|
||||
--with-default-audio=win32_wasapi Use Win32 wasapi audio as default audio output sub-system
|
||||
])
|
||||
|
||||
AC_ARG_WITH([optimization], [
|
||||
@@ -807,6 +861,18 @@ AC_DEFINE_UNQUOTED( MODULE_FILE_SUFFIX, "$with_module_suffix", [The suffix for m
|
||||
dnl ############## Assembler, compiler properties
|
||||
|
||||
# based on posting from John Dalgliesh <johnd@defyne.org> on ffmpeg (LGPL) mailing list
|
||||
# extended to use balign if present
|
||||
AC_MSG_CHECKING([if .balign is present])
|
||||
echo '.balign 4' > conftest.s
|
||||
if $CCAS -c -o conftest.o conftest.s 1>/dev/null 2>&1; then
|
||||
|
||||
AC_MSG_RESULT([yes])
|
||||
AC_DEFINE(ASMALIGN_BALIGN, 1, [ Define if .balign is present. ])
|
||||
|
||||
else
|
||||
|
||||
AC_MSG_RESULT([no])
|
||||
|
||||
# find if .align arg is power-of-two or not
|
||||
asmalign_exp="unknown"
|
||||
if test x"$asmalign_exp" = xunknown; then
|
||||
@@ -823,6 +889,10 @@ if test x"$asmalign_exp" = xunknown; then
|
||||
fi
|
||||
if test x"$asmalign_exp" = xyes; then
|
||||
AC_DEFINE(ASMALIGN_EXP, 1, [ Define if .align takes 3 for alignment of 2^3=8 bytes instead of 8. ])
|
||||
else
|
||||
AC_DEFINE(ASMALIGN_BYTE, 1, [ Define if .align just takes byte count. ])
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
ccalign="unknown"
|
||||
@@ -842,6 +912,49 @@ fi
|
||||
dnl We apply alignment hints only to cpus that need it.
|
||||
dnl See further below for the definition of CCALIGN
|
||||
|
||||
avx_support="unknown"
|
||||
if test x"$avx_support" = xunknown; then
|
||||
AC_MSG_CHECKING([if assembler supports AVX instructions])
|
||||
avx_support="no"
|
||||
echo '.text' > conftest.s
|
||||
echo 'vaddps %ymm0,%ymm0,%ymm0' >> conftest.s
|
||||
if $CCAS -c -o conftest.o conftest.s 1>/dev/null 2>&1; then
|
||||
avx_support="yes"
|
||||
AC_MSG_RESULT([yes])
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
rm -f conftest.o conftest.s
|
||||
fi
|
||||
|
||||
if test x"$avx_support" = xno; then
|
||||
AC_CHECK_PROGS(YASM,[yasm],no)
|
||||
if test x"$YASM" != xno; then
|
||||
AC_MSG_CHECKING([if $YASM supports GAS syntax and AVX instructions])
|
||||
echo '.text' > conftest.s
|
||||
echo 'vaddps %ymm0,%ymm0,%ymm0' >> conftest.s
|
||||
if $YASM -pgas -rcpp -o conftest.o conftest.s 1>/dev/null 2>&1; then
|
||||
avx_support="yes"
|
||||
YASMFLAGS="-pgas -rgas -mamd64"
|
||||
AC_MSG_RESULT([yes])
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
rm -f conftest.o conftest.s
|
||||
fi
|
||||
else
|
||||
YASM="no"
|
||||
fi
|
||||
|
||||
if test "x$cpu_type" = "xavx"; then
|
||||
if test "x$avx_support" != "xyes"; then
|
||||
AC_MSG_ERROR([Assembler doesn't understand AVX instructions.])
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_SUBST(YASM)
|
||||
AC_SUBST(YASMFLAGS)
|
||||
|
||||
dnl ############## Really basic headers, needed for other checks.
|
||||
|
||||
AC_HEADER_STDC
|
||||
@@ -859,12 +972,16 @@ dnl Using the file_offset_bits variable here is fine for linux (possibly Solaris
|
||||
dnl Others... we'll have to see.
|
||||
dnl Note: I started writing this with with multiline replacements.
|
||||
dnl Does not work. Automake insists on putting these into Makefiles where they break things.
|
||||
dnl It is also assumed that a system that does not set file offset bits is not
|
||||
dnl sensitive to largefile changes, i.e. FreeBSD always using 64 bit off_t.
|
||||
if test "x$ac_cv_sys_file_offset_bits" = x || echo "$ac_cv_sys_file_offset_bits" | $GREP '@<:@^0-9@:>@' > /dev/null; then
|
||||
dnl if it has non-numeric chars or is empty... ignore...
|
||||
LFS_LOBJ=
|
||||
largefile_sensitive=no
|
||||
else
|
||||
# Add dual-mode wrapper code.
|
||||
LFS_LOBJ=lfs_wrap.lo
|
||||
largefile_sensitive=yes
|
||||
fi
|
||||
|
||||
# Using the lower level macros instead of AC_TYPE_* for compatibility with not freshest autoconf.
|
||||
@@ -882,19 +999,30 @@ AC_CHECK_SIZEOF(off_t,4)
|
||||
AC_CHECK_SIZEOF(int32_t)
|
||||
AC_CHECK_SIZEOF(long,4)
|
||||
|
||||
# The alias functions want to know the native off_t bits.
|
||||
# "Native" also means large file offsets, if enabled, it's what is native to the mpg123 library.
|
||||
if test "x$ac_cv_sizeof_long" = "x"; then
|
||||
AC_MSG_ERROR([Cannot determine sizeof(long)?])
|
||||
dnl The native type used for aliases is what off_t maps to without any largefile-
|
||||
dnl enabling switches. So, it's long int if the system is largefile-senstive,
|
||||
dnl but it is actual plain off_t if the system does not have such switches.
|
||||
if test "x$largefile_sensitive" = xyes; then
|
||||
lfs_alias_type=long
|
||||
lfs_alias_size=$ac_cv_sizeof_long
|
||||
else
|
||||
LFS_ALIAS_BITS=`expr "$ac_cv_sizeof_long" "*" "8"`
|
||||
lfs_alias_type=off_t
|
||||
lfs_alias_size=$ac_cv_sizeof_off_t
|
||||
fi
|
||||
|
||||
if test "x$lfs_alias_size" = "x"; then
|
||||
AC_MSG_ERROR([Cannot determine sizeof(lfs_alias_t)?])
|
||||
else
|
||||
LFS_ALIAS_BITS=`expr "$lfs_alias_size" "*" "8"`
|
||||
AC_DEFINE_UNQUOTED([lfs_alias_t], $lfs_alias_type,
|
||||
[Define to the native offset type (long or actually off_t).])
|
||||
AC_DEFINE_UNQUOTED([LFS_ALIAS_BITS], $LFS_ALIAS_BITS,
|
||||
[Define this to the size of long type in bits, used for LFS small/native alias functions.])
|
||||
[Define this to the size of native offset type in bits, used for LFS alias functions.])
|
||||
fi
|
||||
|
||||
lfs_alias=enabled
|
||||
AC_ARG_ENABLE(lfs-alias,
|
||||
[ --disable-lfs-alias disable alias wrappers for largefile bitness (mpg123_seek_32 in addition to mpg123_seek, mpg123_seek_64 as alias on x86-64) ],
|
||||
[ --disable-lfs-alias disable alias wrappers for largefile bitness (mpg123_seek_32 or mpg123_seek_64 in addition to mpg123_seek, or the other way around; It is a mess, do not play with this!) ],
|
||||
[
|
||||
if test "x$enableval" = xno; then
|
||||
lfs_alias="disabled"
|
||||
@@ -950,20 +1078,6 @@ AC_CHECK_FUNCS( atoll )
|
||||
|
||||
AC_CHECK_FUNCS( mkfifo, [ have_mkfifo=yes ], [ have_mkfifo=no ] )
|
||||
|
||||
if test x"$fifo" = xauto; then
|
||||
if test x"$have_mkfifo" = xyes; then
|
||||
fifo=enabled
|
||||
else
|
||||
fifo=disabled
|
||||
fi
|
||||
fi
|
||||
if test x"$fifo" = xenabled; then
|
||||
AC_DEFINE(FIFO, 1, [ Define if FIFO support is enabled. ])
|
||||
if test x"$have_mkfifo" = xno; then
|
||||
AC_MSG_WARN( [ You forced FIFO code while I think there is no mkfifo() available! ] )
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl ############## Header and Library Checks
|
||||
|
||||
# locale headers
|
||||
@@ -1036,7 +1150,10 @@ ADD_CPPFLAGS=""
|
||||
ADD_LDFLAGS=""
|
||||
LIBS="$LIBS"
|
||||
|
||||
# Consider moving that stuff.
|
||||
AC_CHECK_HEADER([os2.h], [ADD_CPPFLAGS="$ADD_CPPFLAGS -DOS2"])
|
||||
# On OS/2, we need to link to os2term to make terminal control actually work.
|
||||
AC_CHECK_LIB([os2term], [tcsetattr], [ADD_LDFLAGS="$ADD_LDFLAGS -los2term"])
|
||||
|
||||
# If debugging is enabled then make warnings errors
|
||||
if test x"$debugging" = xenabled; then
|
||||
@@ -1054,7 +1171,7 @@ dnl Only try the attribute_align_arg mumbo-jumbo on x86, x86-64 warns/errors out
|
||||
dnl ...dunno even what about other architectures.
|
||||
case $host in
|
||||
i?86-*)
|
||||
AC_DEFINE(ABI_ALIGN_FUN, 1, [ Define if your architecture wants/needs/can use attribute_align_arg and alignment checks. It's for 32bit x86... ])
|
||||
AC_DEFINE(ABI_ALIGN_FUN, 1, [ Define if your architecture wants/needs/can use attribute_align_arg and alignment checks. It is for 32bit x86... ])
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -1065,14 +1182,20 @@ s_i586="$s_i386 synth_i586"
|
||||
s_i586d="$s_i386 synth_i586_dither"
|
||||
s_3dnow="$s_i386 synth_3dnow dct64_3dnow equalizer_3dnow"
|
||||
s_3dnowext="$s_i386 dct64_3dnowext tabinit_mmx synth_3dnowext"
|
||||
s_3dnow_vintage=$s_3dnow
|
||||
s_3dnowext_vintage=$s_3dnowext
|
||||
if test "x$layer3" = "xenabled"; then
|
||||
s_3dnow="$s_3dnow dct36_3dnow"
|
||||
s_3dnowext="$s_3dnowext dct36_3dnowext"
|
||||
s_3dnow_vintage="$s_3dnow_vintage dct36_3dnow"
|
||||
s_3dnowext_vintage="$s_3dnowext_vintage dct36_3dnowext"
|
||||
fi
|
||||
s_mmx="$s_i386 dct64_mmx tabinit_mmx synth_mmx"
|
||||
s_sse="$s_i386 tabinit_mmx dct64_sse dct64_sse_float synth_sse_float synth_stereo_sse_float synth_sse_s32 synth_stereo_sse_s32 "
|
||||
s_x86_64="dct64_x86_64 dct64_x86_64_float synth_x86_64_float synth_x86_64_s32 synth_stereo_x86_64_float synth_stereo_x86_64_s32"
|
||||
s_sse_vintage="$s_i386 tabinit_mmx dct64_sse dct64_sse_float synth_sse_float synth_stereo_sse_float synth_sse_s32 synth_stereo_sse_s32 "
|
||||
s_sse="$s_sse_vintage dct36_sse"
|
||||
s_x86_64="dct36_x86_64 dct64_x86_64 dct64_x86_64_float synth_x86_64_float synth_x86_64_s32 synth_stereo_x86_64_float synth_stereo_x86_64_s32"
|
||||
s_x86_64_mono_synths="synth_x86_64_float synth_x86_64_s32"
|
||||
s_x86_64_avx="dct36_avx dct64_avx dct64_avx_float synth_stereo_avx_float synth_stereo_avx_s32"
|
||||
s_x86multi="getcpuflags"
|
||||
s_x86_64_multi="getcpuflags_x86_64"
|
||||
s_dither="dither"
|
||||
s_neon="dct64_neon dct64_neon_float synth_neon_float synth_neon_s32 synth_stereo_neon_float synth_stereo_neon_s32"
|
||||
|
||||
@@ -1080,12 +1203,18 @@ s_neon="dct64_neon dct64_neon_float synth_neon_float synth_neon_s32 synth_stereo
|
||||
# note: supporting deactivation of output formats for these decoders would need more logic here
|
||||
if test "x$integers" = "xquality"; then
|
||||
s_sse="$s_sse synth_sse_accurate synth_stereo_sse_accurate"
|
||||
s_sse_vintage="$s_sse_vintage synth_sse_accurate synth_stereo_sse_accurate"
|
||||
s_x86_64="$s_x86_64 synth_x86_64_accurate synth_stereo_x86_64_accurate"
|
||||
s_x86_64_mono_synths="$s_x86_64_mono_synths synth_x86_64_accurate"
|
||||
s_x86_64_avx="$s_x86_64_avx synth_stereo_avx_accurate"
|
||||
s_arm="synth_arm_accurate"
|
||||
s_neon="$s_neon synth_neon_accurate synth_stereo_neon_accurate"
|
||||
else
|
||||
s_sse="$s_sse synth_sse" # no stereo
|
||||
s_sse_vintage="$s_sse_vintage synth_sse" # no stereo
|
||||
s_x86_64="$s_x86_64 synth_x86_64 synth_stereo_x86_64"
|
||||
s_x86_64_mono_synths="$s_x86_64_mono_synths synth_x86_64"
|
||||
s_x86_64_avx="$s_x86_64_avx synth_stereo_avx"
|
||||
s_arm="synth_arm"
|
||||
s_neon="$s_neon synth_neon synth_stereo_neon"
|
||||
fi
|
||||
@@ -1114,7 +1243,7 @@ dnl Not disabling buffer for float mode... check that this is OK now!
|
||||
ccalign=no
|
||||
;;
|
||||
ppc_nofpu)
|
||||
ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_GENERIC -DOPT_PPC -DREAL_IS_FIXED"
|
||||
ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_PPC -DREAL_IS_FIXED"
|
||||
more_sources=
|
||||
ccalign=no
|
||||
;;
|
||||
@@ -1174,6 +1303,10 @@ dnl Not disabling buffer for float mode... check that this is OK now!
|
||||
ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_MULTI -DOPT_I586 -DOPT_3DNOW -DREAL_IS_FLOAT"
|
||||
more_sources="$s_fpu $s_i586 $s_3dnow $s_x86multi "
|
||||
;;
|
||||
3dnow_vintage)
|
||||
ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_MULTI -DOPT_I586 -DOPT_3DNOW_VINTAGE -DREAL_IS_FLOAT"
|
||||
more_sources="$s_fpu $s_i586 $s_3dnow_vintage $s_x86multi "
|
||||
;;
|
||||
3dnow_alone)
|
||||
ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_3DNOW -DREAL_IS_FLOAT"
|
||||
more_sources="$s_fpu $s_3dnow"
|
||||
@@ -1182,6 +1315,10 @@ dnl Not disabling buffer for float mode... check that this is OK now!
|
||||
ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_3DNOWEXT -DREAL_IS_FLOAT"
|
||||
more_sources="$s_fpu $s_3dnowext"
|
||||
;;
|
||||
3dnowext_vintage)
|
||||
ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_MULTI -DOPT_3DNOW -DOPT_3DNOWEXT_VINTAGE -DREAL_IS_FLOAT"
|
||||
more_sources="$s_fpu $s_3dnowext_vintage $s_3dnow $s_x86multi"
|
||||
;;
|
||||
3dnowext)
|
||||
ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_MULTI -DOPT_3DNOW -DOPT_3DNOWEXT -DREAL_IS_FLOAT"
|
||||
more_sources="$s_fpu $s_3dnowext $s_3dnow $s_x86multi"
|
||||
@@ -1194,17 +1331,39 @@ dnl Not disabling buffer for float mode... check that this is OK now!
|
||||
ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_SSE -DREAL_IS_FLOAT"
|
||||
more_sources="$s_fpu $s_sse"
|
||||
;;
|
||||
x86|x86_dither)
|
||||
ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_MULTI -DOPT_GENERIC -DOPT_GENERIC_DITHER -DOPT_I386 -DOPT_I586 -DOPT_I586_DITHER -DOPT_MMX -DOPT_3DNOW -DOPT_3DNOWEXT -DOPT_SSE -DREAL_IS_FLOAT"
|
||||
more_sources="$s_fpu $s_i386 $s_i586 $s_i586d $s_mmx $s_3dnow $s_3dnowext $s_sse $s_x86multi $s_dither"
|
||||
sse_vintage)
|
||||
ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_SSE_VINTAGE -DREAL_IS_FLOAT"
|
||||
more_sources="$s_fpu $s_sse_vintage"
|
||||
;;
|
||||
x86-64)
|
||||
avx)
|
||||
ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_AVX -DREAL_IS_FLOAT"
|
||||
more_sources="$s_fpu $s_x86_64_avx $s_x86_64_mono_synths"
|
||||
if test "x$YASM" != "xno"; then
|
||||
use_yasm_for_avx="yes"
|
||||
fi
|
||||
;;
|
||||
x86|x86_dither)
|
||||
# plain C dct36 always there, for vintage/non-vintage
|
||||
# Selection of non-/vintage sources implies that
|
||||
# $s_3dnow_vintage contains $s_3dnow,
|
||||
# $s_sse contains $s_sse_vintage.
|
||||
ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_MULTI -DOPT_GENERIC -DOPT_GENERIC_DITHER -DOPT_I386 -DOPT_I586 -DOPT_I586_DITHER -DOPT_MMX -DOPT_3DNOW -DOPT_3DNOW_VINTAGE -DOPT_3DNOWEXT -DOPT_3DNOWEXT_VINTAGE -DOPT_SSE -DOPT_SSE_VINTAGE -DREAL_IS_FLOAT"
|
||||
more_sources="$s_fpu $s_i386 $s_i586 $s_i586d $s_mmx $s_3dnow_vintage $s_3dnowext_vintage $s_sse $s_x86multi $s_dither"
|
||||
;;
|
||||
x86-64_alone)
|
||||
ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_X86_64 -DREAL_IS_FLOAT"
|
||||
more_sources="$s_fpu $s_x86_64"
|
||||
;;
|
||||
x86-64_all|x86-64_dither)
|
||||
x86-64|x86-64_all|x86-64_dither)
|
||||
ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_MULTI -DOPT_X86_64 -DOPT_GENERIC -DOPT_GENERIC_DITHER -DREAL_IS_FLOAT"
|
||||
more_sources="$s_fpu $s_x86_64 $s_dither"
|
||||
more_sources="$s_fpu $s_x86_64 $s_dither $s_x86_64_multi"
|
||||
if test "x$avx_support" = "xyes"; then
|
||||
ADD_CPPFLAGS="$ADD_CPPFLAGS -DOPT_AVX"
|
||||
more_sources="$more_sources $s_x86_64_avx"
|
||||
if test "x$YASM" != "xno"; then
|
||||
use_yasm_for_avx="yes"
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
AC_MSG_ERROR([Unknown CPU type '$cpu_type'])
|
||||
@@ -1213,7 +1372,7 @@ esac
|
||||
|
||||
# Mac OS X specific linker flags
|
||||
case $cpu_type in
|
||||
3dnow|3dnow_alone|3dnowext|3dnowext_alone|mmx|mmx_alone|sse|sse_alone|x86|x86_dither)
|
||||
3dnow|3dnow_vintage|3dnow_alone|3dnowext|3dnowext_vintage|3dnowext_alone|mmx|mmx_alone|sse|sse_vintage|sse_alone|x86|x86_dither)
|
||||
case $host in
|
||||
i386-apple-darwin8*|*-apple-darwin10*)
|
||||
ADD_LDFLAGS="$ADD_LDFLAGS -Wl,-read_only_relocs,suppress"
|
||||
@@ -1226,6 +1385,24 @@ case $cpu_type in
|
||||
;;
|
||||
esac
|
||||
|
||||
# Use yasm instead of the default assembler for AVX sources
|
||||
if test "x$use_yasm_for_avx" = "xyes"; then
|
||||
case $host_os in
|
||||
*cygwin*|*mingw*)
|
||||
YASM_FORMAT="-f win64"
|
||||
;;
|
||||
*darwin*)
|
||||
YASM_FORMAT="-f macho"
|
||||
;;
|
||||
*)
|
||||
YASM_FORMAT="-f elf"
|
||||
;;
|
||||
esac
|
||||
AC_DEFINE(USE_YASM_FOR_AVX, 1, [Define to use yasm for assemble AVX sources.])
|
||||
fi
|
||||
AM_CONDITIONAL( [USE_YASM_FOR_AVX], [test "x$use_yasm_for_avx" = xyes] )
|
||||
AC_SUBST(YASM_FORMAT)
|
||||
|
||||
# Check if we want feature report function.
|
||||
AC_MSG_CHECKING([if we want feature report function])
|
||||
feature_report=enabled
|
||||
@@ -1245,11 +1422,27 @@ if test "x$feature_report" = xenabled; then
|
||||
more_sources="$more_sources feature"
|
||||
fi
|
||||
|
||||
# Return 0 if first arg appears in list of following arguments.
|
||||
# Return 1 otherwise.
|
||||
word_in_list() {
|
||||
word=$1
|
||||
shift
|
||||
# Avoid naming conflict with the outside!
|
||||
# Is local not POSIX sh?
|
||||
for given_word in "$@"
|
||||
do
|
||||
if test "x$word" = "x$given_word"; then
|
||||
return 0
|
||||
fi
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
for i in $more_sources
|
||||
do
|
||||
# Echo make sure every file is only once in the list.
|
||||
echo "$DECODER_OBJ" | $GREP -v -w "$i\.\$(OBJEXT)" > /dev/null && DECODER_OBJ="$DECODER_OBJ $i.\$(OBJEXT)"
|
||||
echo "$DECODER_LOBJ" | $GREP -v -w "$i\.lo" > /dev/null && DECODER_LOBJ="$DECODER_LOBJ $i.lo"
|
||||
# Make sure every file is only once in the list.
|
||||
word_in_list "$i.\$(OBJEXT)" $DECODER_OBJ || DECODER_OBJ="$DECODER_OBJ $i.\$(OBJEXT)"
|
||||
word_in_list "$i.lo" $DECODER_LOBJ || DECODER_LOBJ="$DECODER_LOBJ $i.lo"
|
||||
done
|
||||
|
||||
AC_SUBST(DECODER_OBJ)
|
||||
@@ -1264,7 +1457,15 @@ fi
|
||||
dnl ############## Output module choice
|
||||
|
||||
# The full list of supported modules to check, first come, first serve.
|
||||
check_modules="alsa oss coreaudio sndio sun win32 os2 esd jack portaudio pulse sdl nas arts openal dummy"
|
||||
check_modules="alsa tinyalsa oss coreaudio sndio sun win32 win32_wasapi os2 esd jack portaudio pulse sdl nas arts openal dummy"
|
||||
# Only check qsa before all else on QNX.
|
||||
# It would mask ALSA otherwise.
|
||||
case $host in
|
||||
*-nto-qnx*)
|
||||
check_modules="qsa $check_modules"
|
||||
;;
|
||||
esac
|
||||
|
||||
# The final list.
|
||||
output_modules=
|
||||
|
||||
@@ -1300,7 +1501,26 @@ do
|
||||
check_failed=yes
|
||||
fi
|
||||
;;
|
||||
tinyalsa)
|
||||
TINYALSA_LIBS="-ltinyalsa"
|
||||
# Check for ALSA
|
||||
AC_CHECK_LIB( [tinyalsa], [pcm_open],
|
||||
[ AC_CHECK_HEADER( [tinyalsa/asoundlib.h],
|
||||
[ output_modules="$output_modules tinyalsa" HAVE_TINYALSA="yes"],
|
||||
[ AC_MSG_WARN([Found TINYALSA library but NOT header files on your system]) ] )
|
||||
]
|
||||
)
|
||||
if test "x$HAVE_TINYALSA" != xyes; then
|
||||
check_failed=yes
|
||||
fi
|
||||
;;
|
||||
# QSA and ALSA are not distinguishable in these tests, need to block
|
||||
# each other and play with test order depending on platform.
|
||||
alsa)
|
||||
if test "x$HAVE_QSA" = xyes; then
|
||||
HAVE_ALSA=no
|
||||
else
|
||||
|
||||
ALSA_LIBS="-lasound"
|
||||
# Check for ALSA
|
||||
AC_CHECK_LIB( [asound], [snd_pcm_open],
|
||||
@@ -1312,6 +1532,27 @@ do
|
||||
if test "x$HAVE_ALSA" != xyes; then
|
||||
check_failed=yes
|
||||
fi
|
||||
|
||||
fi # HAVE_QSA
|
||||
;;
|
||||
qsa)
|
||||
if test "x$HAVE_ALSA" = xyes; then
|
||||
HAVE_QSA=no
|
||||
else
|
||||
|
||||
QSA_LIBS="-lasound"
|
||||
# Check for QSA
|
||||
AC_CHECK_LIB( [asound], [snd_pcm_open],
|
||||
[ AC_CHECK_HEADER( [sys/asoundlib.h],
|
||||
[ output_modules="$output_modules qsa" HAVE_QSA="yes"],
|
||||
[ AC_MSG_WARN([Found QSA library but NOT header files on your system]) ] )
|
||||
]
|
||||
)
|
||||
if test "x$HAVE_QSA" != xyes; then
|
||||
check_failed=yes
|
||||
fi
|
||||
|
||||
fi # HAVE_ALSA
|
||||
;;
|
||||
jack)
|
||||
PKG_CHECK_MODULES(JACK, jack, output_modules="$output_modules jack" HAVE_JACK="yes", HAVE_JACK="no" check_failed=yes)
|
||||
@@ -1379,6 +1620,40 @@ do
|
||||
WIN32_LIBS=-lwinmm
|
||||
AC_CHECK_HEADERS([windows.h], output_modules="$output_modules win32" HAVE_WIN32=yes, HAVE_WIN32=no check_failed=yes)
|
||||
;;
|
||||
win32_wasapi)
|
||||
# Check for windows ... and win32 wasapi audio
|
||||
# Does not work... instead just check for header
|
||||
# AC_CHECK_LIB( [avrt], [] )
|
||||
AC_MSG_CHECKING([if we have wasapi headers])
|
||||
OLD_LIBS=$LIBS
|
||||
LIBS="$LIBS -lole32 -lavrt"
|
||||
AC_LINK_IFELSE([AC_LANG_SOURCE([
|
||||
#define COBJMACROS 1
|
||||
#define _WIN32_WINNT 0x601
|
||||
#include <initguid.h>
|
||||
#include <audioclient.h>
|
||||
#include <mmdeviceapi.h>
|
||||
#include <avrt.h>
|
||||
int main(){
|
||||
/* UUID Checks */
|
||||
GUID *IDs[] = {
|
||||
&CLSID_MMDeviceEnumerator,
|
||||
&IID_IMMDeviceEnumerator,
|
||||
&IID_IAudioClient,
|
||||
&IID_IAudioRenderClient
|
||||
};
|
||||
return 0;
|
||||
}
|
||||
])], [HAVE_WIN32_WASAPI=yes], [HAVE_WIN32_WASAPI=no])
|
||||
LIBS=$OLD_LIBS
|
||||
WIN32_WASAPI_LIBS="-lole32 -lavrt"
|
||||
AC_MSG_RESULT([$HAVE_WIN32_WASAPI])
|
||||
if test "x$HAVE_WIN32_WASAPI" = xyes; then
|
||||
output_modules="$output_modules win32_wasapi"
|
||||
else
|
||||
check_failed=yes
|
||||
fi
|
||||
;;
|
||||
sndio)
|
||||
SNDIO_LIBS=-lsndio
|
||||
AC_CHECK_LIB([sndio], [sio_open],
|
||||
@@ -1536,7 +1811,8 @@ if test "x$check_forced" = xyes -a "x$check_failed" = "xyes"; then
|
||||
fi
|
||||
|
||||
# When you extend check_modules, you should extend this:
|
||||
#for i in alsa oss coreaudio sndio sun win32 esd jack portaudio pulse sdl nas aix alib arts hp os2 sgi mint openal dummy; do echo $i; done |
|
||||
#for i in alsa qsa oss coreaudio sndio sun win32 win32_wasapi esd jack portaudio pulse sdl nas aix alib arts hp os2 sgi mint openal dummy
|
||||
#do echo $i; done |
|
||||
#perl -ne 'chomp; $big = uc($_); print <<EOT;
|
||||
#AC_SUBST(${big}_LIBS)
|
||||
#AC_SUBST(${big}_LDFLAGS)
|
||||
@@ -1544,10 +1820,18 @@ fi
|
||||
#AM_CONDITIONAL( [HAVE_$big], [test "x\$HAVE_$big" = xyes] )
|
||||
#EOT
|
||||
#'
|
||||
AC_SUBST(TINYALSA_LIBS)
|
||||
AC_SUBST(TINYALSA_LDFLAGS)
|
||||
AC_SUBST(TINYALSA_CFLAGS)
|
||||
AM_CONDITIONAL( [HAVE_TINYALSA], [test "x$HAVE_TINYALSA" = xyes] )
|
||||
AC_SUBST(ALSA_LIBS)
|
||||
AC_SUBST(ALSA_LDFLAGS)
|
||||
AC_SUBST(ALSA_CFLAGS)
|
||||
AM_CONDITIONAL( [HAVE_ALSA], [test "x$HAVE_ALSA" = xyes] )
|
||||
AC_SUBST(QSA_LIBS)
|
||||
AC_SUBST(QSA_LDFLAGS)
|
||||
AC_SUBST(QSA_CFLAGS)
|
||||
AM_CONDITIONAL( [HAVE_QSA], [test "x$HAVE_QSA" = xyes] )
|
||||
AC_SUBST(OSS_LIBS)
|
||||
AC_SUBST(OSS_LDFLAGS)
|
||||
AC_SUBST(OSS_CFLAGS)
|
||||
@@ -1568,6 +1852,10 @@ AC_SUBST(WIN32_LIBS)
|
||||
AC_SUBST(WIN32_LDFLAGS)
|
||||
AC_SUBST(WIN32_CFLAGS)
|
||||
AM_CONDITIONAL( [HAVE_WIN32], [test "x$HAVE_WIN32" = xyes] )
|
||||
AC_SUBST(WIN32_WASAPI_LIBS)
|
||||
AC_SUBST(WIN32_WASAPI_LDFLAGS)
|
||||
AC_SUBST(WIN32_WASAPI_CFLAGS)
|
||||
AM_CONDITIONAL( [HAVE_WIN32_WASAPI], [test "x$HAVE_WIN32_WASAPI" = xyes] )
|
||||
AC_SUBST(ESD_LIBS)
|
||||
AC_SUBST(ESD_LDFLAGS)
|
||||
AC_SUBST(ESD_CFLAGS)
|
||||
@@ -1656,7 +1944,8 @@ then
|
||||
# That feels stupid... what about hashed arrays?
|
||||
case $OUTPUT_MOD in
|
||||
# Here's a script for that tedious list, perhaps to be outsourced together with the one in src/output/Makefile.am
|
||||
#for i in alsa coreaudio esd jack nas oss portaudio pulse sdl sndio sun win32 aix alib arts hp os2 sgi mint; do echo $i; done |
|
||||
#for i in tinyalsa alsa qsa coreaudio esd jack nas oss portaudio pulse sdl sndio sun win32 win32_wasapi aix alib arts hp os2 sgi mint openal
|
||||
#do echo $i; done |
|
||||
#perl -ne 'chomp; $big = uc($_); print <<EOT;
|
||||
# $_)
|
||||
# OUTPUT_LIBS="\$${big}_LIBS"
|
||||
@@ -1665,11 +1954,21 @@ then
|
||||
# ;;
|
||||
#EOT
|
||||
#'
|
||||
tinyalsa)
|
||||
OUTPUT_LIBS="$TINYALSA_LIBS"
|
||||
OUTPUT_LDFLAGS="$TINYALSA_LDFLAGS"
|
||||
OUTPUT_CFLAGS="$TINYALSA_CFLAGS"
|
||||
;;
|
||||
alsa)
|
||||
OUTPUT_LIBS="$ALSA_LIBS"
|
||||
OUTPUT_LDFLAGS="$ALSA_LDFLAGS"
|
||||
OUTPUT_CFLAGS="$ALSA_CFLAGS"
|
||||
;;
|
||||
qsa)
|
||||
OUTPUT_LIBS="$QSA_LIBS"
|
||||
OUTPUT_LDFLAGS="$QSA_LDFLAGS"
|
||||
OUTPUT_CFLAGS="$QSA_CFLAGS"
|
||||
;;
|
||||
coreaudio)
|
||||
OUTPUT_LIBS="$COREAUDIO_LIBS"
|
||||
OUTPUT_LDFLAGS="$COREAUDIO_LDFLAGS"
|
||||
@@ -1725,6 +2024,11 @@ then
|
||||
OUTPUT_LDFLAGS="$WIN32_LDFLAGS"
|
||||
OUTPUT_CFLAGS="$WIN32_CFLAGS"
|
||||
;;
|
||||
win32_wasapi)
|
||||
OUTPUT_LIBS="$WIN32_WASAPI_LIBS"
|
||||
OUTPUT_LDFLAGS="$WIN32_WASAPI_LDFLAGS"
|
||||
OUTPUT_CFLAGS="$WIN32_WASAPI_CFLAGS"
|
||||
;;
|
||||
aix)
|
||||
OUTPUT_LIBS="$AIX_LIBS"
|
||||
OUTPUT_LDFLAGS="$AIX_LDFLAGS"
|
||||
@@ -1791,6 +2095,9 @@ CFLAGS="$ADD_CFLAGS $CFLAGS"
|
||||
if test x"$buffer" = xdisabled; then
|
||||
ADD_CPPFLAGS="$ADD_CPPFLAGS -DNOXFERMEM"
|
||||
fi
|
||||
if test x"$newoldwritesample" = xenabled; then
|
||||
ADD_CPPFLAGS="$ADD_CPPFLAGS -DNEWOLD_WRITE_SAMPLE"
|
||||
fi
|
||||
CPPFLAGS="$ADD_CPPFLAGS $CPPFLAGS"
|
||||
LDFLAGS="$ADD_LDFLAGS $LDFLAGS"
|
||||
|
||||
@@ -1864,8 +2171,8 @@ win32_sockets_working=no
|
||||
win32_wide_working=no
|
||||
win32_winver_bump=no
|
||||
AC_CHECK_HEADERS([windows.h], [win32_specific_codes=enabled])
|
||||
if test "x$win32_specific_codes" = xenabled && test "x$host_os" != "xcygwin"; then
|
||||
|
||||
if test "x$win32_specific_codes" = xenabled && test "x$host_os" != "xcygwin"; then
|
||||
#### Check for Wide functions
|
||||
AC_CHECK_FUNC([_wopen], [win32_unicode=enabled],[win32_unicode=disabled])
|
||||
AC_MSG_CHECKING([if we want Unicode File Open for Win32])
|
||||
@@ -1952,10 +2259,47 @@ if test "x$win32_specific_codes" = xenabled && test "x$host_os" != "xcygwin"; th
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
|
||||
#### Check for Win32 Named Pipe functions
|
||||
win32_fifo_working=no
|
||||
if test x$win32_specific_codes = xenabled; then
|
||||
AC_MSG_CHECKING([if we have Named Pipes])
|
||||
if test "x$fifo" != "xdisabled"; then
|
||||
AC_LINK_IFELSE([AC_LANG_SOURCE([
|
||||
#include <windows.h>
|
||||
int main(){
|
||||
CreateNamedPipeA(NULL,PIPE_ACCESS_DUPLEX|FILE_FLAG_OVERLAPPED,PIPE_TYPE_BYTE,1,255,255,0,NULL);
|
||||
CreateNamedPipeW(NULL,PIPE_ACCESS_DUPLEX|FILE_FLAG_OVERLAPPED,PIPE_TYPE_BYTE,1,255,255,0,NULL);
|
||||
return 0;
|
||||
}])],[win32_fifo_working=yes],[win32_winver_bump=yes])
|
||||
if test "x$win32_fifo_working" != "xyes"; then
|
||||
AC_LINK_IFELSE([AC_LANG_SOURCE([
|
||||
#define WINVER 0x501
|
||||
#define _WIN32_WINNT 0x501
|
||||
#include <windows.h>
|
||||
int main(){
|
||||
CreateNamedPipeA(NULL,PIPE_ACCESS_DUPLEX|FILE_FLAG_OVERLAPPED,PIPE_TYPE_BYTE,1,255,255,0,NULL);
|
||||
CreateNamedPipeW(NULL,PIPE_ACCESS_DUPLEX|FILE_FLAG_OVERLAPPED,PIPE_TYPE_BYTE,1,255,255,0,NULL);
|
||||
return 0;
|
||||
}])],[win32_fifo_working=yes],[win32_fifo_working=no])
|
||||
fi
|
||||
fi
|
||||
have_mkfifo=$win32_fifo_working
|
||||
if test "x$win32_fifo_working" = "xyes"; then
|
||||
AC_MSG_RESULT([yes])
|
||||
AC_DEFINE([WANT_WIN32_FIFO], [1], [ Define to use Win32 named pipes ])
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
fi
|
||||
|
||||
#### WINVER Bump
|
||||
if test x$win32_specific_codes = xenabled; then
|
||||
AC_MSG_CHECKING([if WINVER and _WIN32_WINNT needs version bumps])
|
||||
if test "x$win32_winver_bump" = "xyes"; then
|
||||
AC_MSG_RESULT([yes])
|
||||
CFLAGS="$CFLAGS -DWINVER=0x0501 -D_WIN32_WINNT=0x0501"
|
||||
AC_DEFINE([WINVER], [0x0501], [ WinXP and above for ipv6 ])
|
||||
AC_DEFINE([_WIN32_WINNT], [0x0501], [ WinXP and above for ipv6 ])
|
||||
# getaddrinfo and freeaddrinfo are available for Win2K and above
|
||||
# Bug: MinGW.org w32api ws2tcpip.h incorrectly wants (_WIN32_WINNT >= 0x0501) for getaddrinfo and freeaddrinfo
|
||||
# MultiByteToWideChar and WideCharToMultiByte are available for Win2K and above
|
||||
@@ -1964,6 +2308,17 @@ if test "x$win32_specific_codes" = xenabled && test "x$host_os" != "xcygwin"; th
|
||||
fi
|
||||
fi
|
||||
|
||||
fi #END OF WIN32 CHECKS
|
||||
|
||||
#### Check mingw.org for EOVERFLOW
|
||||
AC_MSG_CHECKING([if we have EOVERFLOW macro])
|
||||
AC_COMPILE_IFELSE([AC_LANG_SOURCE([
|
||||
#include <errno.h>
|
||||
int i = (EOVERFLOW) + 0;
|
||||
])],[eoverflow_present=yes],[eoverflow_present=no])
|
||||
AC_MSG_RESULT([$eoverflow_present])
|
||||
AS_IF([test "x$eoverflow_present" = "xyes"],[],[AC_DEFINE([EOVERFLOW],[EFBIG],[Use EFBIG as substitude for EOVERFLOW, mingw.org may lack the latter])])
|
||||
|
||||
#### Use Win32 support codes
|
||||
AM_CONDITIONAL([WIN32_CODES], [ test "x$win32_specific_codes" = xenabled ])
|
||||
|
||||
@@ -1982,6 +2337,23 @@ if test x"$ipv6" = xauto; then
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl ############## FIFO enable
|
||||
|
||||
if test x"$fifo" = xauto; then
|
||||
if test x"$have_mkfifo" = xyes; then
|
||||
fifo=enabled
|
||||
else
|
||||
fifo=disabled
|
||||
fi
|
||||
fi
|
||||
|
||||
if test x"$fifo" = xenabled; then
|
||||
AC_DEFINE(FIFO, 1, [ Define if FIFO support is enabled. ])
|
||||
if test x"$have_mkfifo" = xno; then
|
||||
AC_MSG_WARN( [ You forced FIFO code while I think there is no mkfifo() available! ] )
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl ############## Network enable
|
||||
if test x"$network" = xenabled; then
|
||||
AC_DEFINE(NETWORK, 1, [ Define if network support is enabled. ])
|
||||
@@ -2042,19 +2414,10 @@ else
|
||||
echo " The lib will (try to) support default offset size, too."
|
||||
fi
|
||||
echo " LFS alias symbols ....... $lfs_alias ($LFS_ALIAS_BITS)"
|
||||
echo " LFS alias type .......... $lfs_alias_type"
|
||||
|
||||
echo " Alignment checks ........ $aligncheck"
|
||||
if test x"$aligncheck" = xenabled; then
|
||||
if test x"$ccalign" != xyes; then
|
||||
echo " (without effect since special alignment is not employed)"
|
||||
fi
|
||||
if test x"$GCC" = xyes; then
|
||||
echo " (note that newer gcc 4.x versions do not use/need the align check)"
|
||||
fi
|
||||
fi
|
||||
echo -n "
|
||||
Core libmpg123 features:
|
||||
Integer conversion ...... $integers
|
||||
Layer I ................. $layer1
|
||||
Layer II ................ $layer2
|
||||
Layer III ............... $layer3
|
||||
@@ -2072,6 +2435,12 @@ echo -n "
|
||||
16 bit integer .......... $int16
|
||||
32/24 bit integer ....... $int32
|
||||
real (32 bit float) ..... $real
|
||||
Optimization detail:
|
||||
Integer conversion ...... $integers
|
||||
New/old WRITE_SAMPLE .... $newoldwritesample
|
||||
new Huffman scheme ...... $newhuff
|
||||
|
||||
Note: Disabling core features is not commonly done and some combinations might not build/work. If you encounter such a case, help yourself (and provide a patch) or just poke the maintainers.
|
||||
"
|
||||
# just an empty line
|
||||
echo
|
||||
@@ -0,0 +1,82 @@
|
||||
Regarding largefile setup, client apps can be built three ways:
|
||||
|
||||
1. _FILE_OFFSET_BITS == 64 (header maps to mpg123_open_64)
|
||||
2. _FILE_OFFSET_BITS == 32 (header maps to mpg123_open_32)
|
||||
3. _FILE_OFFSET_BITS == <nothing> (header maps to mpg123_open)
|
||||
|
||||
The libmpg123 build needs to be prepared for everything. Also, it needs to keep
|
||||
in mind the days before introducing large file support --- binaries should still
|
||||
work with updated libmpg123. So, mpg123_open should always match what is the
|
||||
default build on a platform without added settings. Those are the platform
|
||||
variants:
|
||||
|
||||
1. 64 bit native system, long == off_t
|
||||
libmpg123: mpg123_open
|
||||
lfs_alias: mpg123_open_64 -> mpg123_open
|
||||
lfs_wrap: <none>
|
||||
|
||||
2. largefile-sensitive, long = 32, off_t = 64 (if enabled)
|
||||
libmpg123: mpg123_open_64
|
||||
lfs_alias: mpg123_open_32 -> mpg123_open
|
||||
lfs_wrap: mpg123_open -> mpg123_open_64
|
||||
|
||||
3. largefile, long = 32, off_t = 64 (FreeBSD)
|
||||
libmpg123: mpg123_open
|
||||
lfs_alias: mpg123_open_64 -> mpg123_open
|
||||
lfs_wrap: <none>
|
||||
|
||||
This is what mpg123 does in version 1.15.4 and it works. Well, for cases 1
|
||||
(Linux/Solaris x86-64) and 2 (Linux/Solaris x86). Case 3 needs to be added
|
||||
properly. Actually, let's have a second look at case 2: When mpg123 is built
|
||||
with --disable-largefile:
|
||||
|
||||
2a. largefile-sensitive, mpg123 built with off_t = 32 == long
|
||||
libmpg123: mpg123_open
|
||||
lfs_alias: mpg123_open_32 -> mpg123_open
|
||||
lfs_wrap: <none>
|
||||
|
||||
So, this is still correct. Now, what about case 3? What does mpg123 do
|
||||
currently, as of 1.15.4?
|
||||
|
||||
3a. largefile, long = 32, off_t = 64 (... and mpg123 not really aware of that)
|
||||
libmpg123: mpg123_open
|
||||
lfs_alias: mpg123_open_32(long) -> mpg123_open(off_t)
|
||||
lfs_wrap: <none>
|
||||
|
||||
This is _wrong_. Luckily, this does not cause binary compatibility issues, as
|
||||
mpg123_open_32 won't be called by anyone unless that someone tries to define
|
||||
_FILE_OFFSET_BITS=32, which is nonsense. Perhaps old FreeBSD binaries before
|
||||
LFS times? Well, back then, there was no libmpg123. So let's ignore that case.
|
||||
The issue at hand is that the alias should be from mpg123_open_64 to
|
||||
mpg123_open, for clients that insist on defining _FILE_OFFSET_BITS=64.
|
||||
|
||||
The change needed now is to fix the naming and also change the type the
|
||||
alias functions use: It is not long int anymore!
|
||||
|
||||
Let's revisit case 1 for a moment: My old lfs_alias.c provides for the case
|
||||
lfs_alias: mpg123_open -> mpg123_open_64. Is that actually possible?
|
||||
What means enforcing _FILE_OFFSET_BITS=64 from the outside, which _could_
|
||||
happen when libmpg123 is included someplace and folks are on the wrong side
|
||||
of paranoid regarding this. So, there is
|
||||
|
||||
1a. 64 bit native system, long == off_t = 64 and _FILE_OFFSET_BITS=64
|
||||
libmpg123: mpg123_open_64
|
||||
lfs_alias: mpg123_open -> mpg123_open_64
|
||||
lfs_wrap: <none>
|
||||
|
||||
(Works also for any system with long == off_t in any width)
|
||||
Likewise, there is largefile-sensitive system with enforced 32 bits:
|
||||
|
||||
2b. largefile-sensitive, mpg123 with enforced _FILE_OFFSET_BITS=32
|
||||
libmpg123: mpg123_open_32
|
||||
lfs_alias: mpg123_open -> mpg123_open_32
|
||||
lfs_wrap: <none>
|
||||
|
||||
All cases are supported with this significant change from 1.15.4:
|
||||
Make the aliases use a defined lfs_alias_t, which can be long or off_t,
|
||||
depending on what is the default type for offsets on the platform.
|
||||
Folks who try _FILE_OFFSET_BITS=32 on a system that only supports
|
||||
64 bit get a linking error during mpg123 build (from the _64 aliases),
|
||||
which I consider to be a feature.
|
||||
|
||||
I salute anyone who is not confused after reading this.
|
||||
@@ -1,9 +1,8 @@
|
||||
# Makefile.in generated by automake 1.11 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.14 from Makefile.am.
|
||||
# doc/Makefile. Generated from Makefile.in by configure.
|
||||
|
||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
||||
# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
||||
# Inc.
|
||||
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
|
||||
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
@@ -15,6 +14,51 @@
|
||||
|
||||
|
||||
|
||||
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
|
||||
am__make_running_with_option = \
|
||||
case $${target_option-} in \
|
||||
?) ;; \
|
||||
*) echo "am__make_running_with_option: internal error: invalid" \
|
||||
"target option '$${target_option-}' specified" >&2; \
|
||||
exit 1;; \
|
||||
esac; \
|
||||
has_opt=no; \
|
||||
sane_makeflags=$$MAKEFLAGS; \
|
||||
if $(am__is_gnu_make); then \
|
||||
sane_makeflags=$$MFLAGS; \
|
||||
else \
|
||||
case $$MAKEFLAGS in \
|
||||
*\\[\ \ ]*) \
|
||||
bs=\\; \
|
||||
sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
|
||||
| sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
|
||||
esac; \
|
||||
fi; \
|
||||
skip_next=no; \
|
||||
strip_trailopt () \
|
||||
{ \
|
||||
flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
|
||||
}; \
|
||||
for flg in $$sane_makeflags; do \
|
||||
test $$skip_next = yes && { skip_next=no; continue; }; \
|
||||
case $$flg in \
|
||||
*=*|--*) continue;; \
|
||||
-*I) strip_trailopt 'I'; skip_next=yes;; \
|
||||
-*I?*) strip_trailopt 'I';; \
|
||||
-*O) strip_trailopt 'O'; skip_next=yes;; \
|
||||
-*O?*) strip_trailopt 'O';; \
|
||||
-*l) strip_trailopt 'l'; skip_next=yes;; \
|
||||
-*l?*) strip_trailopt 'l';; \
|
||||
-[dEDm]) skip_next=yes;; \
|
||||
-[JT]) skip_next=yes;; \
|
||||
esac; \
|
||||
case $$flg in \
|
||||
*$$target_option*) has_opt=yes; break;; \
|
||||
esac; \
|
||||
done; \
|
||||
test $$has_opt = yes
|
||||
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
|
||||
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
|
||||
pkgdatadir = $(datadir)/mpg123
|
||||
pkgincludedir = $(includedir)/mpg123
|
||||
pkglibdir = $(libdir)/mpg123
|
||||
@@ -31,10 +75,10 @@ POST_INSTALL = :
|
||||
NORMAL_UNINSTALL = :
|
||||
PRE_UNINSTALL = :
|
||||
POST_UNINSTALL = :
|
||||
build_triplet = i686-pc-linux-gnu
|
||||
host_triplet = i686-pc-linux-gnu
|
||||
build_triplet = 86_64-unknown-linux-gnu
|
||||
host_triplet = arm-unknown-linux-androideabi
|
||||
subdir = doc
|
||||
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in THANKS TODO
|
||||
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am THANKS TODO
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/m4/addrconfig.m4 \
|
||||
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
|
||||
@@ -46,10 +90,28 @@ mkinstalldirs = $(install_sh) -d
|
||||
CONFIG_HEADER = $(top_builddir)/src/config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
CONFIG_CLEAN_VPATH_FILES =
|
||||
AM_V_P = $(am__v_P_$(V))
|
||||
am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY))
|
||||
am__v_P_0 = false
|
||||
am__v_P_1 = :
|
||||
AM_V_GEN = $(am__v_GEN_$(V))
|
||||
am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
|
||||
am__v_GEN_0 = @echo " GEN " $@;
|
||||
am__v_GEN_1 =
|
||||
AM_V_at = $(am__v_at_$(V))
|
||||
am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
|
||||
am__v_at_0 = @
|
||||
am__v_at_1 =
|
||||
SOURCES =
|
||||
DIST_SOURCES =
|
||||
am__can_run_installinfo = \
|
||||
case $$AM_UPDATE_INFO_DIR in \
|
||||
n|no|NO) false;; \
|
||||
*) (install-info --version) >/dev/null 2>&1;; \
|
||||
esac
|
||||
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
ACLOCAL = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run aclocal-1.11
|
||||
ACLOCAL = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing aclocal-1.14
|
||||
AIX_CFLAGS =
|
||||
AIX_LDFLAGS =
|
||||
AIX_LIBS =
|
||||
@@ -58,32 +120,33 @@ ALIB_LDFLAGS =
|
||||
ALIB_LIBS =
|
||||
ALSA_CFLAGS =
|
||||
ALSA_LDFLAGS =
|
||||
ALSA_LIBS =
|
||||
AMTAR = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run tar
|
||||
API_VERSION = 29
|
||||
AR = ar
|
||||
ALSA_LIBS = -lasound
|
||||
AMTAR = $${TAR-tar}
|
||||
AM_DEFAULT_VERBOSITY = 1
|
||||
API_VERSION = 38
|
||||
AR = arm-linux-androideabi-ar
|
||||
ARTS_CFLAGS =
|
||||
ARTS_LDFLAGS =
|
||||
ARTS_LIBS =
|
||||
AS = as
|
||||
AUTOCONF = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run autoconf
|
||||
AUTOHEADER = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run autoheader
|
||||
AUTOMAKE = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run automake-1.11
|
||||
AWK = gawk
|
||||
CC = gcc
|
||||
CCAS = gcc
|
||||
AUTOCONF = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing autoconf
|
||||
AUTOHEADER = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing autoheader
|
||||
AUTOMAKE = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing automake-1.14
|
||||
AWK = mawk
|
||||
CC = arm-linux-androideabi-gcc
|
||||
CCAS = arm-linux-androideabi-gcc
|
||||
CCASDEPMODE = depmode=gcc3
|
||||
CCASFLAGS = -g -O2
|
||||
CCDEPMODE = depmode=gcc3
|
||||
CFLAGS = -O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -g -O2
|
||||
COREAUDIO_CFLAGS =
|
||||
COREAUDIO_LDFLAGS =
|
||||
COREAUDIO_LIBS =
|
||||
CPP = gcc -E
|
||||
CPPFLAGS = -DOPT_GENERIC -DREAL_IS_FLOAT
|
||||
COREAUDIO_LIBS = -framework AudioToolbox -framework AudioUnit -framework CoreServices
|
||||
CPP = arm-linux-androideabi-gcc -E
|
||||
CPPFLAGS = -DOPT_ARM -DREAL_IS_FIXED
|
||||
CYGPATH_W = echo
|
||||
DECODER_LOBJ = stringbuf.lo icy.lo icy2utf8.lo ntom.lo synth.lo synth_8bit.lo layer1.lo layer2.lo layer3.lo synth_s32.lo synth_real.lo feature.lo
|
||||
DECODER_OBJ = stringbuf.$(OBJEXT) icy.$(OBJEXT) icy2utf8.$(OBJEXT) ntom.$(OBJEXT) synth.$(OBJEXT) synth_8bit.$(OBJEXT) layer1.$(OBJEXT) layer2.$(OBJEXT) layer3.$(OBJEXT) synth_s32.$(OBJEXT) synth_real.$(OBJEXT) feature.$(OBJEXT)
|
||||
DECODER_LOBJ = stringbuf.lo icy.lo icy2utf8.lo ntom.lo synth.lo synth_8bit.lo layer1.lo layer2.lo layer3.lo synth_arm.lo feature.lo
|
||||
DECODER_OBJ = stringbuf.$(OBJEXT) icy.$(OBJEXT) icy2utf8.$(OBJEXT) ntom.$(OBJEXT) synth.$(OBJEXT) synth_8bit.$(OBJEXT) layer1.$(OBJEXT) layer2.$(OBJEXT) layer3.$(OBJEXT) synth_arm.$(OBJEXT) feature.$(OBJEXT)
|
||||
DEFS = -DHAVE_CONFIG_H
|
||||
DEPDIR = .deps
|
||||
DLLTOOL = dlltool
|
||||
@@ -117,10 +180,10 @@ INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
|
||||
JACK_CFLAGS =
|
||||
JACK_LDFLAGS =
|
||||
JACK_LIBS =
|
||||
LD = /usr/bin/ld
|
||||
LD = /opt/android-ndk-r8e/ndk-standalone/arm-linux-androideabi/bin/ld
|
||||
LDFLAGS =
|
||||
LFS_LOBJ = lfs_wrap.lo lfs_alias.lo
|
||||
LIBMPG123_VERSION = 29:6:29
|
||||
LFS_LOBJ = lfs_alias.lo
|
||||
LIBMPG123_VERSION = 38:4:38
|
||||
LIBOBJS =
|
||||
LIBS = -lm
|
||||
LIBTOOL = $(SHELL) $(top_builddir)/libtool
|
||||
@@ -128,7 +191,7 @@ LIPO =
|
||||
LN_S = ln -s
|
||||
LTLIBOBJS =
|
||||
LT_LDFLAGS = -export-dynamic
|
||||
MAKEINFO = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/missing --run makeinfo
|
||||
MAKEINFO = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/missing makeinfo
|
||||
MANIFEST_TOOL = :
|
||||
MINT_CFLAGS =
|
||||
MINT_LDFLAGS =
|
||||
@@ -137,8 +200,8 @@ MKDIR_P = /bin/mkdir -p
|
||||
MODULE_OBJ = legacy_module.$(OBJEXT)
|
||||
NAS_CFLAGS =
|
||||
NAS_LDFLAGS =
|
||||
NAS_LIBS =
|
||||
NM = /usr/bin/nm -B
|
||||
NAS_LIBS = -laudio
|
||||
NM = /opt/android-ndk-r8e/ndk-standalone/bin/arm-linux-androideabi-nm -B
|
||||
NMEDIT =
|
||||
OBJDUMP = objdump
|
||||
OBJEXT = o
|
||||
@@ -147,7 +210,7 @@ OPENAL_LDFLAGS =
|
||||
OPENAL_LIBS =
|
||||
OS2_CFLAGS =
|
||||
OS2_LDFLAGS =
|
||||
OS2_LIBS =
|
||||
OS2_LIBS = -los2me -lmmpm2 -lsocket
|
||||
OSS_CFLAGS =
|
||||
OSS_LDFLAGS =
|
||||
OSS_LIBS =
|
||||
@@ -156,27 +219,30 @@ OTOOL64 =
|
||||
OUTPUT_CFLAGS =
|
||||
OUTPUT_LDFLAGS =
|
||||
OUTPUT_LIBS =
|
||||
OUTPUT_MOD = dummy
|
||||
OUTPUT_OBJ = output/dummy.$(OBJEXT)
|
||||
OUTPUT_MOD = oss
|
||||
OUTPUT_OBJ = output/oss.$(OBJEXT)
|
||||
PACKAGE = mpg123
|
||||
PACKAGE_BUGREPORT = mpg123-devel@lists.sourceforge.net
|
||||
PACKAGE_NAME = mpg123
|
||||
PACKAGE_STRING = mpg123 1.13.4
|
||||
PACKAGE_STRING = mpg123 1.17.0
|
||||
PACKAGE_TARNAME = mpg123
|
||||
PACKAGE_URL =
|
||||
PACKAGE_VERSION = 1.13.4
|
||||
PACKAGE_VERSION = 1.17.0
|
||||
PATH_SEPARATOR = :
|
||||
PKG_CONFIG = /usr/bin/pkg-config
|
||||
PORTAUDIO_CFLAGS =
|
||||
PORTAUDIO_LDFLAGS =
|
||||
PORTAUDIO_LIBS =
|
||||
PULSE_CFLAGS =
|
||||
PORTAUDIO_LIBS = -lportaudio
|
||||
PULSE_CFLAGS = -D_REENTRANT
|
||||
PULSE_LDFLAGS =
|
||||
PULSE_LIBS =
|
||||
RANLIB = ranlib
|
||||
SDL_CFLAGS =
|
||||
PULSE_LIBS = -lpulse-simple -lpulse
|
||||
QSA_CFLAGS =
|
||||
QSA_LDFLAGS =
|
||||
QSA_LIBS =
|
||||
RANLIB = arm-linux-androideabi-ranlib
|
||||
SDL_CFLAGS = -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/include/SDL
|
||||
SDL_LDFLAGS =
|
||||
SDL_LIBS =
|
||||
SDL_LIBS = -lSDL
|
||||
SED = /bin/sed
|
||||
SET_MAKE =
|
||||
SGI_CFLAGS =
|
||||
@@ -185,54 +251,63 @@ SGI_LIBS =
|
||||
SHELL = /bin/bash
|
||||
SNDIO_CFLAGS =
|
||||
SNDIO_LDFLAGS =
|
||||
SNDIO_LIBS =
|
||||
STRIP = strip
|
||||
SNDIO_LIBS = -lsndio
|
||||
STRIP = arm-linux-androideabi-strip
|
||||
SUN_CFLAGS =
|
||||
SUN_LDFLAGS =
|
||||
SUN_LIBS =
|
||||
VERSION = 1.13.4
|
||||
TINYALSA_CFLAGS =
|
||||
TINYALSA_LDFLAGS =
|
||||
TINYALSA_LIBS = -ltinyalsa
|
||||
VERSION = 1.17.0
|
||||
WIN32_CFLAGS =
|
||||
WIN32_LDFLAGS =
|
||||
WIN32_LIBS =
|
||||
abs_builddir = /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/doc
|
||||
abs_srcdir = /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/doc
|
||||
abs_top_builddir = /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4
|
||||
abs_top_srcdir = /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4
|
||||
ac_ct_AR = ar
|
||||
ac_ct_CC = gcc
|
||||
WIN32_LIBS = -lwinmm
|
||||
WIN32_WASAPI_CFLAGS =
|
||||
WIN32_WASAPI_LDFLAGS =
|
||||
WIN32_WASAPI_LIBS = -lole32 -lavrt
|
||||
YASM = yasm
|
||||
YASMFLAGS = -pgas -rgas -mamd64
|
||||
YASM_FORMAT =
|
||||
abs_builddir = /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/doc
|
||||
abs_srcdir = /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/doc
|
||||
abs_top_builddir = /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0
|
||||
abs_top_srcdir = /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0
|
||||
ac_ct_AR =
|
||||
ac_ct_CC =
|
||||
ac_ct_DUMPBIN =
|
||||
am__include = include
|
||||
am__leading_dot = .
|
||||
am__quote =
|
||||
am__tar = ${AMTAR} chof - "$$tardir"
|
||||
am__untar = ${AMTAR} xf -
|
||||
am__tar = $${TAR-tar} chof - "$$tardir"
|
||||
am__untar = $${TAR-tar} xf -
|
||||
bindir = ${exec_prefix}/bin
|
||||
build = i686-pc-linux-gnu
|
||||
build_alias =
|
||||
build_cpu = i686
|
||||
build = 86_64-unknown-linux-gnu
|
||||
build_alias = 86_64-unknown-linux-gnu
|
||||
build_cpu = 86_64
|
||||
build_os = linux-gnu
|
||||
build_vendor = pc
|
||||
build_vendor = unknown
|
||||
builddir = .
|
||||
datadir = ${datarootdir}
|
||||
datarootdir = ${prefix}/share
|
||||
docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
|
||||
dvidir = ${docdir}
|
||||
exec_prefix = ${prefix}
|
||||
host = i686-pc-linux-gnu
|
||||
host_alias =
|
||||
host_cpu = i686
|
||||
host_os = linux-gnu
|
||||
host_vendor = pc
|
||||
host = arm-unknown-linux-androideabi
|
||||
host_alias = arm-linux-androideabi
|
||||
host_cpu = arm
|
||||
host_os = linux-androideabi
|
||||
host_vendor = unknown
|
||||
htmldir = ${docdir}
|
||||
includedir = ${prefix}/include
|
||||
infodir = ${datarootdir}/info
|
||||
install_sh = ${SHELL} /home/hagish/workspace/adt/love-native-android/jni/mpg123-1.13.4/build/install-sh
|
||||
install_sh = ${SHELL} /home/mfelis/projects/love/android-sdl2/zips/mpg123-1.17.0/build/install-sh
|
||||
libdir = ${exec_prefix}/lib
|
||||
libexecdir = ${exec_prefix}/libexec
|
||||
localedir = ${datarootdir}/locale
|
||||
localstatedir = ${prefix}/var
|
||||
mandir = ${datarootdir}/man
|
||||
mkdir_p = /bin/mkdir -p
|
||||
mkdir_p = $(MKDIR_P)
|
||||
oldincludedir = /usr/include
|
||||
pdfdir = ${docdir}
|
||||
prefix = /usr/local
|
||||
@@ -242,7 +317,7 @@ sbindir = ${exec_prefix}/sbin
|
||||
sharedstatedir = ${prefix}/com
|
||||
srcdir = .
|
||||
sysconfdir = ${prefix}/etc
|
||||
target_alias =
|
||||
target_alias = arm-linux-androideabi
|
||||
top_build_prefix = ../
|
||||
top_builddir = ..
|
||||
top_srcdir = ..
|
||||
@@ -259,6 +334,7 @@ EXTRA_DIST = \
|
||||
LICENSE \
|
||||
THANKS \
|
||||
ACCURACY \
|
||||
LARGEFILE \
|
||||
libmpg123_speed.txt \
|
||||
doxyhead.xhtml \
|
||||
doxy_examples.c \
|
||||
@@ -269,6 +345,7 @@ EXTRA_DIST = \
|
||||
examples/id3dump.c \
|
||||
examples/feedseek.c \
|
||||
examples/dump_seekindex.c \
|
||||
examples/extract_frames.c \
|
||||
examples/Makefile
|
||||
|
||||
all: all-am
|
||||
@@ -310,11 +387,11 @@ mostlyclean-libtool:
|
||||
|
||||
clean-libtool:
|
||||
-rm -rf .libs _libs
|
||||
tags: TAGS
|
||||
TAGS:
|
||||
tags TAGS:
|
||||
|
||||
ctags: CTAGS
|
||||
CTAGS:
|
||||
ctags CTAGS:
|
||||
|
||||
cscope cscopelist:
|
||||
|
||||
|
||||
distdir: $(DISTFILES)
|
||||
@@ -361,10 +438,15 @@ install-am: all-am
|
||||
|
||||
installcheck: installcheck-am
|
||||
install-strip:
|
||||
if test -z '$(STRIP)'; then \
|
||||
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
|
||||
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
|
||||
`test -z '$(STRIP)' || \
|
||||
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
|
||||
install; \
|
||||
else \
|
||||
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
|
||||
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
|
||||
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
|
||||
fi
|
||||
mostlyclean-generic:
|
||||
|
||||
clean-generic:
|
||||
@@ -445,15 +527,16 @@ uninstall-am:
|
||||
.MAKE: install-am install-strip
|
||||
|
||||
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
|
||||
distclean distclean-generic distclean-libtool distdir dvi \
|
||||
dvi-am html html-am info info-am install install-am \
|
||||
install-data install-data-am install-dvi install-dvi-am \
|
||||
install-exec install-exec-am install-html install-html-am \
|
||||
install-info install-info-am install-man install-pdf \
|
||||
install-pdf-am install-ps install-ps-am install-strip \
|
||||
installcheck installcheck-am installdirs maintainer-clean \
|
||||
maintainer-clean-generic mostlyclean mostlyclean-generic \
|
||||
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
|
||||
cscopelist-am ctags-am distclean distclean-generic \
|
||||
distclean-libtool distdir dvi dvi-am html html-am info info-am \
|
||||
install install-am install-data install-data-am install-dvi \
|
||||
install-dvi-am install-exec install-exec-am install-html \
|
||||
install-html-am install-info install-info-am install-man \
|
||||
install-pdf install-pdf-am install-ps install-ps-am \
|
||||
install-strip installcheck installcheck-am installdirs \
|
||||
maintainer-clean maintainer-clean-generic mostlyclean \
|
||||
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
|
||||
tags-am uninstall uninstall-am
|
||||
|
||||
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
@@ -18,6 +18,7 @@ EXTRA_DIST = \
|
||||
LICENSE \
|
||||
THANKS \
|
||||
ACCURACY \
|
||||
LARGEFILE \
|
||||
libmpg123_speed.txt \
|
||||
doxyhead.xhtml \
|
||||
doxy_examples.c \
|
||||
@@ -28,4 +29,5 @@ EXTRA_DIST = \
|
||||
examples/id3dump.c \
|
||||
examples/feedseek.c \
|
||||
examples/dump_seekindex.c \
|
||||
examples/extract_frames.c \
|
||||
examples/Makefile
|
||||
@@ -1,9 +1,8 @@
|
||||
# Makefile.in generated by automake 1.11 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.14 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
||||
# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
||||
# Inc.
|
||||
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
|
||||
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
@@ -15,6 +14,51 @@
|
||||
|
||||
@SET_MAKE@
|
||||
VPATH = @srcdir@
|
||||
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
|
||||
am__make_running_with_option = \
|
||||
case $${target_option-} in \
|
||||
?) ;; \
|
||||
*) echo "am__make_running_with_option: internal error: invalid" \
|
||||
"target option '$${target_option-}' specified" >&2; \
|
||||
exit 1;; \
|
||||
esac; \
|
||||
has_opt=no; \
|
||||
sane_makeflags=$$MAKEFLAGS; \
|
||||
if $(am__is_gnu_make); then \
|
||||
sane_makeflags=$$MFLAGS; \
|
||||
else \
|
||||
case $$MAKEFLAGS in \
|
||||
*\\[\ \ ]*) \
|
||||
bs=\\; \
|
||||
sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
|
||||
| sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
|
||||
esac; \
|
||||
fi; \
|
||||
skip_next=no; \
|
||||
strip_trailopt () \
|
||||
{ \
|
||||
flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
|
||||
}; \
|
||||
for flg in $$sane_makeflags; do \
|
||||
test $$skip_next = yes && { skip_next=no; continue; }; \
|
||||
case $$flg in \
|
||||
*=*|--*) continue;; \
|
||||
-*I) strip_trailopt 'I'; skip_next=yes;; \
|
||||
-*I?*) strip_trailopt 'I';; \
|
||||
-*O) strip_trailopt 'O'; skip_next=yes;; \
|
||||
-*O?*) strip_trailopt 'O';; \
|
||||
-*l) strip_trailopt 'l'; skip_next=yes;; \
|
||||
-*l?*) strip_trailopt 'l';; \
|
||||
-[dEDm]) skip_next=yes;; \
|
||||
-[JT]) skip_next=yes;; \
|
||||
esac; \
|
||||
case $$flg in \
|
||||
*$$target_option*) has_opt=yes; break;; \
|
||||
esac; \
|
||||
done; \
|
||||
test $$has_opt = yes
|
||||
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
|
||||
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
|
||||
pkgdatadir = $(datadir)/@PACKAGE@
|
||||
pkgincludedir = $(includedir)/@PACKAGE@
|
||||
pkglibdir = $(libdir)/@PACKAGE@
|
||||
@@ -34,7 +78,7 @@ POST_UNINSTALL = :
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
subdir = doc
|
||||
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in THANKS TODO
|
||||
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am THANKS TODO
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/m4/addrconfig.m4 \
|
||||
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
|
||||
@@ -46,8 +90,26 @@ mkinstalldirs = $(install_sh) -d
|
||||
CONFIG_HEADER = $(top_builddir)/src/config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
CONFIG_CLEAN_VPATH_FILES =
|
||||
AM_V_P = $(am__v_P_@AM_V@)
|
||||
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
|
||||
am__v_P_0 = false
|
||||
am__v_P_1 = :
|
||||
AM_V_GEN = $(am__v_GEN_@AM_V@)
|
||||
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
|
||||
am__v_GEN_0 = @echo " GEN " $@;
|
||||
am__v_GEN_1 =
|
||||
AM_V_at = $(am__v_at_@AM_V@)
|
||||
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
|
||||
am__v_at_0 = @
|
||||
am__v_at_1 =
|
||||
SOURCES =
|
||||
DIST_SOURCES =
|
||||
am__can_run_installinfo = \
|
||||
case $$AM_UPDATE_INFO_DIR in \
|
||||
n|no|NO) false;; \
|
||||
*) (install-info --version) >/dev/null 2>&1;; \
|
||||
esac
|
||||
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
ACLOCAL = @ACLOCAL@
|
||||
AIX_CFLAGS = @AIX_CFLAGS@
|
||||
@@ -60,6 +122,7 @@ ALSA_CFLAGS = @ALSA_CFLAGS@
|
||||
ALSA_LDFLAGS = @ALSA_LDFLAGS@
|
||||
ALSA_LIBS = @ALSA_LIBS@
|
||||
AMTAR = @AMTAR@
|
||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||
API_VERSION = @API_VERSION@
|
||||
AR = @AR@
|
||||
ARTS_CFLAGS = @ARTS_CFLAGS@
|
||||
@@ -173,6 +236,9 @@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
|
||||
PULSE_CFLAGS = @PULSE_CFLAGS@
|
||||
PULSE_LDFLAGS = @PULSE_LDFLAGS@
|
||||
PULSE_LIBS = @PULSE_LIBS@
|
||||
QSA_CFLAGS = @QSA_CFLAGS@
|
||||
QSA_LDFLAGS = @QSA_LDFLAGS@
|
||||
QSA_LIBS = @QSA_LIBS@
|
||||
RANLIB = @RANLIB@
|
||||
SDL_CFLAGS = @SDL_CFLAGS@
|
||||
SDL_LDFLAGS = @SDL_LDFLAGS@
|
||||
@@ -190,10 +256,19 @@ STRIP = @STRIP@
|
||||
SUN_CFLAGS = @SUN_CFLAGS@
|
||||
SUN_LDFLAGS = @SUN_LDFLAGS@
|
||||
SUN_LIBS = @SUN_LIBS@
|
||||
TINYALSA_CFLAGS = @TINYALSA_CFLAGS@
|
||||
TINYALSA_LDFLAGS = @TINYALSA_LDFLAGS@
|
||||
TINYALSA_LIBS = @TINYALSA_LIBS@
|
||||
VERSION = @VERSION@
|
||||
WIN32_CFLAGS = @WIN32_CFLAGS@
|
||||
WIN32_LDFLAGS = @WIN32_LDFLAGS@
|
||||
WIN32_LIBS = @WIN32_LIBS@
|
||||
WIN32_WASAPI_CFLAGS = @WIN32_WASAPI_CFLAGS@
|
||||
WIN32_WASAPI_LDFLAGS = @WIN32_WASAPI_LDFLAGS@
|
||||
WIN32_WASAPI_LIBS = @WIN32_WASAPI_LIBS@
|
||||
YASM = @YASM@
|
||||
YASMFLAGS = @YASMFLAGS@
|
||||
YASM_FORMAT = @YASM_FORMAT@
|
||||
abs_builddir = @abs_builddir@
|
||||
abs_srcdir = @abs_srcdir@
|
||||
abs_top_builddir = @abs_top_builddir@
|
||||
@@ -259,6 +334,7 @@ EXTRA_DIST = \
|
||||
LICENSE \
|
||||
THANKS \
|
||||
ACCURACY \
|
||||
LARGEFILE \
|
||||
libmpg123_speed.txt \
|
||||
doxyhead.xhtml \
|
||||
doxy_examples.c \
|
||||
@@ -269,6 +345,7 @@ EXTRA_DIST = \
|
||||
examples/id3dump.c \
|
||||
examples/feedseek.c \
|
||||
examples/dump_seekindex.c \
|
||||
examples/extract_frames.c \
|
||||
examples/Makefile
|
||||
|
||||
all: all-am
|
||||
@@ -310,11 +387,11 @@ mostlyclean-libtool:
|
||||
|
||||
clean-libtool:
|
||||
-rm -rf .libs _libs
|
||||
tags: TAGS
|
||||
TAGS:
|
||||
tags TAGS:
|
||||
|
||||
ctags: CTAGS
|
||||
CTAGS:
|
||||
ctags CTAGS:
|
||||
|
||||
cscope cscopelist:
|
||||
|
||||
|
||||
distdir: $(DISTFILES)
|
||||
@@ -361,10 +438,15 @@ install-am: all-am
|
||||
|
||||
installcheck: installcheck-am
|
||||
install-strip:
|
||||
if test -z '$(STRIP)'; then \
|
||||
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
|
||||
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
|
||||
`test -z '$(STRIP)' || \
|
||||
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
|
||||
install; \
|
||||
else \
|
||||
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
|
||||
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
|
||||
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
|
||||
fi
|
||||
mostlyclean-generic:
|
||||
|
||||
clean-generic:
|
||||
@@ -445,15 +527,16 @@ uninstall-am:
|
||||
.MAKE: install-am install-strip
|
||||
|
||||
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
|
||||
distclean distclean-generic distclean-libtool distdir dvi \
|
||||
dvi-am html html-am info info-am install install-am \
|
||||
install-data install-data-am install-dvi install-dvi-am \
|
||||
install-exec install-exec-am install-html install-html-am \
|
||||
install-info install-info-am install-man install-pdf \
|
||||
install-pdf-am install-ps install-ps-am install-strip \
|
||||
installcheck installcheck-am installdirs maintainer-clean \
|
||||
maintainer-clean-generic mostlyclean mostlyclean-generic \
|
||||
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
|
||||
cscopelist-am ctags-am distclean distclean-generic \
|
||||
distclean-libtool distdir dvi dvi-am html html-am info info-am \
|
||||
install install-am install-data install-data-am install-dvi \
|
||||
install-dvi-am install-exec install-exec-am install-html \
|
||||
install-html-am install-info install-info-am install-man \
|
||||
install-pdf install-pdf-am install-ps install-ps-am \
|
||||
install-strip installcheck installcheck-am installdirs \
|
||||
maintainer-clean maintainer-clean-generic mostlyclean \
|
||||
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
|
||||
tags-am uninstall uninstall-am
|
||||
|
||||
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
@@ -28,6 +28,8 @@ LOAD/L <trackname>: load and start playing resource <trackname>
|
||||
|
||||
LOADPAUSED/LP <trackname>: load but do not start playing resource <trackname>
|
||||
|
||||
LOADLIST <entry> <url>: load a playlist from given <url>, and display its entries, optionally load and play one of these specificed by the integer <entry> (<0: just list, 0: play last track, >0:play track with that position in list)
|
||||
|
||||
PAUSE/P: pause playback
|
||||
|
||||
STOP/S: stop playback (closes file)
|
||||
@@ -84,7 +86,7 @@ Note: mpg123 returns errors on stderr, so your frontend should
|
||||
look not only at stdout but also at stderr for responses.
|
||||
It is a good idea to use --remote-err and just look at stderr.
|
||||
|
||||
@R MPG123 (ThOr) v6
|
||||
@R MPG123 (ThOr) v7
|
||||
Startup version message. Everything after MPG123 is auxilliary information about behaviour and command support, ID3v2 tag support is new in v3.
|
||||
|
||||
@I ID3:<a><b><c>
|
||||
@@ -107,6 +109,9 @@ Note: mpg123 returns errors on stderr, so your frontend should
|
||||
Status message after loading a song (no ID3 song info)
|
||||
a = filename without path and extension
|
||||
|
||||
@I LISTENTRY <n>: <url>
|
||||
printout of playlists loaded with LOADLIST
|
||||
|
||||
@S <a> <b> ...
|
||||
Stream info at beginning of playback, meaning
|
||||
S <mpeg-version> <layer> <sampling freq> <mode(stereo/mono/...)> <mode_ext> <framesize> <stereo> <copyright> <error_protected> <emphasis> <bitrate> <extension> <vbr(0/1=yes/no)>
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
/** \file mpglib.c Example program mimicking the old mpglib test program.
|
||||
It takes an MPEG bitstream from standard input and writes raw audio to standard output.
|
||||
This is an use case of the mpg123_decode() in and out function in the feeder mode.
|
||||
This is an use case of the mpg123_decode() in and out function in the feeder mode, quite close to classic mpglib usage and thus a template to convert from that to libmpg123.
|
||||
*/
|
||||
|
||||
/** \file scan.c Example program that examines the exact length of an MPEG file.
|
||||
@@ -14,4 +14,8 @@
|
||||
|
||||
/** \file id3dump.c Parse ID3 info and print to standard output. */
|
||||
|
||||
/** \file extract_frames.c Parse stream and extract only the valid MPEG frames to standard output. */
|
||||
|
||||
/** \file feedseek.c Fuzzy feeder seeking. */
|
||||
|
||||
/* @} */
|
||||
@@ -9,7 +9,7 @@ CREATE_SUBDIRS = NO
|
||||
OUTPUT_LANGUAGE = English
|
||||
FULL_PATH_NAMES = NO
|
||||
|
||||
INPUT = doxy_examples.c examples/mpg123_to_wav.c examples/mpglib.c examples/scan.c examples/id3dump.c ../src/libmpg123/mpg123.h
|
||||
INPUT = doxy_examples.c examples/mpg123_to_wav.c examples/mpglib.c examples/scan.c examples/feedseek.c examples/id3dump.c ../src/libmpg123/mpg123.h
|
||||
OPTIMIZE_OUTPUT_FOR_C = YES
|
||||
EXTRACT_ALL = NO
|
||||
HIDE_UNDOC_MEMBERS = NO
|
||||
@@ -1,4 +1,4 @@
|
||||
targets = feedseek mpg123_to_wav mpg123_to_wav_replaced_io scan id3dump mpglib dump_seekindex
|
||||
targets = feedseek mpg123_to_wav mpg123_to_wav_replaced_io scan id3dump mpglib dump_seekindex extract_frames
|
||||
|
||||
all: $(targets)
|
||||
|
||||
@@ -6,8 +6,13 @@ all: $(targets)
|
||||
#MPG123_CFLAGS := $(shell pkg-config --cflags libmpg123_64)
|
||||
#MPG123_LDFLAGS := $(shell pkg-config --libs libmpg123_64)
|
||||
# This works on sane setups where off_t is off_t, and just that.
|
||||
MPG123_CFLAGS := $(shell pkg-config --cflags libmpg123)
|
||||
MPG123_LDFLAGS := $(shell pkg-config --libs libmpg123)
|
||||
ifeq ($(MPG123_PREFIX),)
|
||||
MPG123_CFLAGS := $(shell pkg-config --cflags libmpg123)
|
||||
MPG123_LDFLAGS := $(shell pkg-config --libs libmpg123)
|
||||
else # Yeah, that's with GNU/Linux in mind, at least GNU ld ...
|
||||
MPG123_CFLAGS := -I$(MPG123_PREFIX)/include
|
||||
MPG123_LDFLAGS := -L$(MPG123_PREFIX)/lib -Wl,-rpath $(MPG123_PREFIX)/lib -lmpg123
|
||||
endif
|
||||
SND_CFLAGS := $(shell pkg-config --cflags sndfile)
|
||||
SND_LDFLAGS := $(shell pkg-config --libs sndfile)
|
||||
|
||||
@@ -36,5 +41,8 @@ dump_seekindex: dump_seekindex.c
|
||||
mpglib: mpglib.c
|
||||
$(compile) -o mpglib mpglib.c $(linkflags)
|
||||
|
||||
extract_frames: extract_frames.c
|
||||
$(compile) -o $@ $< $(linkflags)
|
||||
|
||||
clean:
|
||||
rm -vf $(targets)
|
||||
@@ -0,0 +1,92 @@
|
||||
/*
|
||||
extract_frams: utlize the framebyframe API and mpg123_framedata to extract the MPEG frames out of a stream (strip off anything else).
|
||||
|
||||
copyright 2011 by the mpg123 project - free software under the terms of the LGPL 2.1
|
||||
see COPYING and AUTHORS files in distribution or http://mpg123.org
|
||||
initially written by Thomas Orgis
|
||||
*/
|
||||
|
||||
#include <mpg123.h>
|
||||
|
||||
/* unistd.h is not available under MSVC,
|
||||
io.h defines the read and write functions */
|
||||
#ifndef _MSC_VER
|
||||
#include <unistd.h>
|
||||
#else
|
||||
#include <io.h>
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
int do_work(mpg123_handle *m);
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
int ret = 0;
|
||||
mpg123_handle *m;
|
||||
|
||||
mpg123_init();
|
||||
m = mpg123_new(NULL, &ret);
|
||||
|
||||
if(m == NULL)
|
||||
{
|
||||
fprintf(stderr, "Cannot create handle: %s", mpg123_plain_strerror(ret));
|
||||
}
|
||||
else
|
||||
{
|
||||
fprintf(stderr, "I'll take your dirty MPEG audio from standard input and will write the extracted pure MPEG data to standard output.\n");
|
||||
if(argc > 1 && strcmp(argv[1], "--noinfo") == 0)
|
||||
{
|
||||
fprintf(stderr, "Enabling parsing/consuming of the Info frame so that it will not appear in output.\n");
|
||||
ret = mpg123_param(m, MPG123_REMOVE_FLAGS, MPG123_IGNORE_INFOFRAME, 0.);
|
||||
}
|
||||
else
|
||||
{
|
||||
fprintf(stderr, "If you'd have given --noinfo as argument, I would omit a LAME/Xing info frame.\n");
|
||||
ret = mpg123_param(m, MPG123_ADD_FLAGS, MPG123_IGNORE_INFOFRAME, 0.);
|
||||
}
|
||||
if(ret == 0) ret = do_work(m);
|
||||
|
||||
if(ret != 0) fprintf(stderr, "Some error occured: %s\n", mpg123_strerror(m));
|
||||
|
||||
|
||||
mpg123_delete(m); /* Closes, too. */
|
||||
}
|
||||
mpg123_exit();
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
int do_work(mpg123_handle *m)
|
||||
{
|
||||
int ret;
|
||||
size_t count = 0;
|
||||
ret = mpg123_open_fd(m, STDIN_FILENO);
|
||||
if(ret != MPG123_OK) return ret;
|
||||
|
||||
while( (ret = mpg123_framebyframe_next(m)) == MPG123_OK || ret == MPG123_NEW_FORMAT )
|
||||
{
|
||||
unsigned long header;
|
||||
unsigned char *bodydata;
|
||||
size_t bodybytes;
|
||||
if(mpg123_framedata(m, &header, &bodydata, &bodybytes) == MPG123_OK)
|
||||
{
|
||||
/* Need to extract the 4 header bytes from the native storage in the correct order. */
|
||||
unsigned char hbuf[4];
|
||||
int i;
|
||||
for(i=0; i<4; ++i) hbuf[i] = (unsigned char) ((header >> ((3-i)*8)) & 0xff);
|
||||
|
||||
/* Now write out both header and data, fire and forget. */
|
||||
write(STDOUT_FILENO, hbuf, 4);
|
||||
write(STDOUT_FILENO, bodydata, bodybytes);
|
||||
fprintf(stderr, "%zu: header 0x%08x, %zu body bytes\n", ++count, header, bodybytes);
|
||||
}
|
||||
}
|
||||
|
||||
if(ret != MPG123_DONE)
|
||||
fprintf(stderr, "Some error occured (non-fatal?): %s\n", mpg123_strerror(m));
|
||||
|
||||
fprintf(stderr, "Done with %zu MPEG frames.\n", count);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -94,9 +94,15 @@ void print_raw_v2(mpg123_id3v2 *v2)
|
||||
for(i=0; i<v2->texts; ++i)
|
||||
{
|
||||
char id[5];
|
||||
char lang[4];
|
||||
memcpy(id, v2->text[i].id, 4);
|
||||
id[4] = 0;
|
||||
printf("%s\n", id);
|
||||
memcpy(lang, v2->text[i].lang, 3);
|
||||
lang[3] = 0;
|
||||
if(v2->text[i].description.fill)
|
||||
printf("%s language(%s) description(%s)\n", id, lang, v2->text[i].description.p);
|
||||
else printf("%s language(%s)\n", id, lang);
|
||||
|
||||
print_lines(" ", &v2->text[i].text);
|
||||
}
|
||||
for(i=0; i<v2->extras; ++i)
|
||||
+30
-15
@@ -14,7 +14,7 @@
|
||||
|
||||
void usage()
|
||||
{
|
||||
printf("Usage: mpg123_to_wav <input> <output>\n");
|
||||
printf("Usage: mpg123_to_wav <input> <output> [s16|f32 [ <buffersize>]]\n");
|
||||
exit(99);
|
||||
}
|
||||
|
||||
@@ -39,24 +39,32 @@ int main(int argc, char *argv[])
|
||||
int err = MPG123_OK;
|
||||
off_t samples = 0;
|
||||
|
||||
if (argc!=3) usage();
|
||||
if (argc<3) usage();
|
||||
printf( "Input file: %s\n", argv[1]);
|
||||
printf( "Output file: %s\n", argv[2]);
|
||||
|
||||
err = mpg123_init();
|
||||
if( err != MPG123_OK || (mh = mpg123_new(NULL, &err)) == NULL
|
||||
/* Let mpg123 work with the file, that excludes MPG123_NEED_MORE messages. */
|
||||
|| mpg123_open(mh, argv[1]) != MPG123_OK
|
||||
/* Peek into track and get first output format. */
|
||||
|| mpg123_getformat(mh, &rate, &channels, &encoding) != MPG123_OK )
|
||||
if(err != MPG123_OK || (mh = mpg123_new(NULL, &err)) == NULL)
|
||||
{
|
||||
fprintf( stderr, "Trouble with mpg123: %s\n",
|
||||
mh==NULL ? mpg123_plain_strerror(err) : mpg123_strerror(mh) );
|
||||
fprintf(stderr, "Basic setup goes wrong: %s", mpg123_plain_strerror(err));
|
||||
cleanup(mh);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if(encoding != MPG123_ENC_SIGNED_16)
|
||||
/* Simple hack to enable floating point output. */
|
||||
if(argc >= 4 && !strcmp(argv[3], "f32")) mpg123_param(mh, MPG123_ADD_FLAGS, MPG123_FORCE_FLOAT, 0.);
|
||||
|
||||
/* Let mpg123 work with the file, that excludes MPG123_NEED_MORE messages. */
|
||||
if( mpg123_open(mh, argv[1]) != MPG123_OK
|
||||
/* Peek into track and get first output format. */
|
||||
|| mpg123_getformat(mh, &rate, &channels, &encoding) != MPG123_OK )
|
||||
{
|
||||
fprintf( stderr, "Trouble with mpg123: %s\n", mpg123_strerror(mh) );
|
||||
cleanup(mh);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if(encoding != MPG123_ENC_SIGNED_16 && encoding != MPG123_ENC_FLOAT_32)
|
||||
{ /* Signed 16 is the default output format anyways; it would actually by only different if we forced it.
|
||||
So this check is here just for this explanation. */
|
||||
cleanup(mh);
|
||||
@@ -70,22 +78,29 @@ int main(int argc, char *argv[])
|
||||
bzero(&sfinfo, sizeof(sfinfo) );
|
||||
sfinfo.samplerate = rate;
|
||||
sfinfo.channels = channels;
|
||||
sfinfo.format = SF_FORMAT_WAV|SF_FORMAT_PCM_16;
|
||||
printf("Creating 16bit WAV with %i channels and %liHz.\n", channels, rate);
|
||||
sfinfo.format = SF_FORMAT_WAV|(encoding == MPG123_ENC_SIGNED_16 ? SF_FORMAT_PCM_16 : SF_FORMAT_FLOAT);
|
||||
printf("Creating WAV with %i channels and %liHz.\n", channels, rate);
|
||||
|
||||
sndfile = sf_open(argv[2], SFM_WRITE, &sfinfo);
|
||||
if(sndfile == NULL){ fprintf(stderr, "Cannot open output file!\n"); cleanup(mh); return -2; }
|
||||
|
||||
/* Buffer could be almost any size here, mpg123_outblock() is just some recommendation.
|
||||
Important, especially for sndfile writing, is that the size is a multiple of sample size. */
|
||||
buffer_size = mpg123_outblock( mh );
|
||||
buffer_size = argc >= 5 ? atol(argv[4]) : mpg123_outblock(mh);
|
||||
buffer = malloc( buffer_size );
|
||||
|
||||
do
|
||||
{
|
||||
sf_count_t more_samples;
|
||||
err = mpg123_read( mh, buffer, buffer_size, &done );
|
||||
sf_write_short( sndfile, (short*)buffer, done/sizeof(short) );
|
||||
samples += done/sizeof(short);
|
||||
more_samples = encoding == MPG123_ENC_SIGNED_16
|
||||
? sf_write_short(sndfile, (short*)buffer, done/sizeof(short))
|
||||
: sf_write_float(sndfile, (float*)buffer, done/sizeof(float));
|
||||
if(more_samples < 0 || more_samples*mpg123_encsize(encoding) != done)
|
||||
{
|
||||
fprintf(stderr, "Warning: Written number of samples does not match the byte count we got from libmpg123: %li != %li\n", (long)(more_samples*mpg123_encsize(encoding)), (long)done);
|
||||
}
|
||||
samples += more_samples;
|
||||
/* We are not in feeder mode, so MPG123_OK, MPG123_ERR and MPG123_NEW_FORMAT are the only possibilities.
|
||||
We do not handle a new format, MPG123_DONE is the end... so abort on anything not MPG123_OK. */
|
||||
} while (err==MPG123_OK);
|
||||
@@ -16,6 +16,10 @@
|
||||
#include <io.h>
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
#include <fcntl.h>
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#define INBUFF 16384
|
||||
@@ -31,6 +35,11 @@ int main(int argc, char **argv)
|
||||
size_t in = 0, outc = 0;
|
||||
mpg123_handle *m;
|
||||
|
||||
#ifdef _WIN32
|
||||
_setmode(_fileno(stdin),_O_BINARY);
|
||||
_setmode(_fileno(stdout),_O_BINARY);
|
||||
#endif
|
||||
|
||||
mpg123_init();
|
||||
m = mpg123_new(argc > 1 ? argv[1] : NULL, &ret);
|
||||
if(m == NULL)
|
||||
@@ -6,6 +6,6 @@ includedir=${prefix}/include
|
||||
Name: libmpg123
|
||||
Description: An optimised MPEG Audio decoder
|
||||
Requires:
|
||||
Version: 1.13.4
|
||||
Version: 1.17.0
|
||||
Libs: -L${libdir} -lmpg123
|
||||
Cflags: -I${includedir}
|
||||
@@ -1,13 +1,13 @@
|
||||
#! /bin/bash
|
||||
|
||||
# libtool - Provide generalized library-building support services.
|
||||
# Generated automatically by config.status (mpg123) 1.13.4
|
||||
# Libtool was configured on host dormouse:
|
||||
# Generated automatically by config.status (mpg123) 1.17.0
|
||||
# Libtool was configured on host ilium:
|
||||
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
|
||||
#
|
||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
|
||||
# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
|
||||
# Inc.
|
||||
# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
|
||||
# Foundation, Inc.
|
||||
# Written by Gordon Matzigkeit, 1996
|
||||
#
|
||||
# This file is part of GNU Libtool.
|
||||
@@ -55,8 +55,8 @@ DLLTOOL="dlltool"
|
||||
OBJDUMP="objdump"
|
||||
|
||||
# Which release of libtool.m4 was used?
|
||||
macro_version=2.4
|
||||
macro_revision=1.3293
|
||||
macro_version=2.4.2
|
||||
macro_revision=1.3337
|
||||
|
||||
# What type of objects to build.
|
||||
pic_mode=default
|
||||
@@ -70,14 +70,17 @@ SHELL="/bin/bash"
|
||||
# An echo program that protects backslashes.
|
||||
ECHO="printf %s\\n"
|
||||
|
||||
# The PATH separator for the build system.
|
||||
PATH_SEPARATOR=":"
|
||||
|
||||
# The host system.
|
||||
host_alias=
|
||||
host=i686-pc-linux-gnu
|
||||
host_os=linux-gnu
|
||||
host_alias=arm-linux-androideabi
|
||||
host=arm-unknown-linux-androideabi
|
||||
host_os=linux-androideabi
|
||||
|
||||
# The build system.
|
||||
build_alias=
|
||||
build=i686-pc-linux-gnu
|
||||
build_alias=86_64-unknown-linux-gnu
|
||||
build=86_64-unknown-linux-gnu
|
||||
build_os=linux-gnu
|
||||
|
||||
# A sed program that does not truncate output.
|
||||
@@ -96,7 +99,7 @@ EGREP="/bin/grep -E"
|
||||
FGREP="/bin/grep -F"
|
||||
|
||||
# A BSD- or MS-compatible name lister.
|
||||
NM="/usr/bin/nm -B"
|
||||
NM="/opt/android-ndk-r8e/ndk-standalone/bin/arm-linux-androideabi-nm -B"
|
||||
|
||||
# Whether we need soft or hard links.
|
||||
LN_S="ln -s"
|
||||
@@ -141,7 +144,7 @@ want_nocaseglob="no"
|
||||
sharedlib_from_linklib_cmd="printf %s\\n"
|
||||
|
||||
# The archiver.
|
||||
AR="ar"
|
||||
AR="arm-linux-androideabi-ar"
|
||||
|
||||
# Flags to create an archive.
|
||||
AR_FLAGS="cru"
|
||||
@@ -150,18 +153,18 @@ AR_FLAGS="cru"
|
||||
archiver_list_spec="@"
|
||||
|
||||
# A symbol stripping program.
|
||||
STRIP="strip"
|
||||
STRIP="arm-linux-androideabi-strip"
|
||||
|
||||
# Commands used to install an old-style archive.
|
||||
RANLIB="ranlib"
|
||||
old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib"
|
||||
RANLIB="arm-linux-androideabi-ranlib"
|
||||
old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$tool_oldlib"
|
||||
old_postuninstall_cmds=""
|
||||
|
||||
# Whether to use a lock for old archive extraction.
|
||||
lock_old_archive_extraction=no
|
||||
|
||||
# A C compiler.
|
||||
LTCC="gcc"
|
||||
LTCC="arm-linux-androideabi-gcc"
|
||||
|
||||
# LTCC compiler flags.
|
||||
LTCFLAGS="-O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -g -O2"
|
||||
@@ -272,10 +275,10 @@ finish_eval=""
|
||||
hardcode_into_libs=yes
|
||||
|
||||
# Compile-time system search path for libraries.
|
||||
sys_lib_search_path_spec="/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5.2 /usr/lib/i386-linux-gnu /lib /usr/lib "
|
||||
sys_lib_search_path_spec="/opt/android-ndk-r8e/ndk-standalone/lib/gcc/arm-linux-androideabi/4.6 /opt/android-ndk-r8e/ndk-standalone/lib/gcc /opt/android-ndk-r8e/ndk-standalone/arm-linux-androideabi/lib /opt/android-ndk-r8e/ndk-standalone/sysroot/usr/lib "
|
||||
|
||||
# Run-time system search path for libraries.
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib/mesa /lib/i386-linux-gnu /usr/lib/i386-linux-gnu /lib/i686-linux-gnu /usr/lib/i686-linux-gnu /usr/lib/alsa-lib /usr/local/lib "
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib/i386-linux-gnu/mesa /lib/i386-linux-gnu /usr/lib/i386-linux-gnu /lib/i686-linux-gnu /usr/lib/i686-linux-gnu /usr/local/lib /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu/mesa-egl /usr/lib/x86_64-linux-gnu/mesa /lib32 /usr/lib32 "
|
||||
|
||||
# Whether dlopen is supported.
|
||||
dlopen_support=unknown
|
||||
@@ -287,22 +290,22 @@ dlopen_self=unknown
|
||||
dlopen_self_static=unknown
|
||||
|
||||
# Commands to strip libraries.
|
||||
old_striplib="strip --strip-debug"
|
||||
striplib="strip --strip-unneeded"
|
||||
old_striplib="arm-linux-androideabi-strip --strip-debug"
|
||||
striplib="arm-linux-androideabi-strip --strip-unneeded"
|
||||
|
||||
|
||||
# The linker used to build libraries.
|
||||
LD="/usr/bin/ld"
|
||||
LD="/opt/android-ndk-r8e/ndk-standalone/arm-linux-androideabi/bin/ld"
|
||||
|
||||
# How to create reloadable object files.
|
||||
reload_flag=" -r"
|
||||
reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
|
||||
|
||||
# Commands used to build an old-style archive.
|
||||
old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib"
|
||||
old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$tool_oldlib"
|
||||
|
||||
# A language specific compiler.
|
||||
CC="gcc"
|
||||
CC="arm-linux-androideabi-gcc"
|
||||
|
||||
# Is the compiler the GNU compiler?
|
||||
with_gcc=yes
|
||||
@@ -368,10 +371,6 @@ no_undefined_flag=""
|
||||
# This must work even if $libdir does not exist
|
||||
hardcode_libdir_flag_spec="\${wl}-rpath \${wl}\$libdir"
|
||||
|
||||
# If ld is used when linking, flag to hardcode $libdir into a binary
|
||||
# during linking. This must work even if $libdir does not exist.
|
||||
hardcode_libdir_flag_spec_ld=""
|
||||
|
||||
# Whether we need a single "-rpath" flag with a separated argument.
|
||||
hardcode_libdir_separator=""
|
||||
|
||||
@@ -432,11 +431,11 @@ hardcode_action=immediate
|
||||
# ### END LIBTOOL CONFIG
|
||||
|
||||
|
||||
# libtool (GNU libtool) 2.4
|
||||
# libtool (GNU libtool) 2.4.2
|
||||
# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
|
||||
|
||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
|
||||
# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
|
||||
# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
|
||||
# This is free software; see the source for copying conditions. There is NO
|
||||
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
|
||||
@@ -474,6 +473,7 @@ hardcode_action=immediate
|
||||
# --quiet, --silent don't print informational messages
|
||||
# --no-quiet, --no-silent
|
||||
# print informational messages (default)
|
||||
# --no-warn don't display warning messages
|
||||
# --tag=TAG use configuration variables from tag TAG
|
||||
# -v, --verbose print more informational messages than default
|
||||
# --no-verbose don't print the extra informational messages
|
||||
@@ -502,7 +502,7 @@ hardcode_action=immediate
|
||||
# compiler: $LTCC
|
||||
# compiler flags: $LTCFLAGS
|
||||
# linker: $LD (gnu? $with_gnu_ld)
|
||||
# $progname: (GNU libtool) 2.4
|
||||
# $progname: (GNU libtool) 2.4.2
|
||||
# automake: $automake_version
|
||||
# autoconf: $autoconf_version
|
||||
#
|
||||
@@ -512,9 +512,9 @@ hardcode_action=immediate
|
||||
|
||||
PROGRAM=libtool
|
||||
PACKAGE=libtool
|
||||
VERSION=2.4
|
||||
VERSION=2.4.2
|
||||
TIMESTAMP=""
|
||||
package_revision=1.3293
|
||||
package_revision=1.3337
|
||||
|
||||
# Be Bourne compatible
|
||||
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
||||
@@ -569,15 +569,10 @@ progpath="$0"
|
||||
|
||||
: ${CP="cp -f"}
|
||||
test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
|
||||
: ${EGREP="grep -E"}
|
||||
: ${FGREP="grep -F"}
|
||||
: ${GREP="grep"}
|
||||
: ${LN_S="ln -s"}
|
||||
: ${MAKE="make"}
|
||||
: ${MKDIR="mkdir"}
|
||||
: ${MV="mv -f"}
|
||||
: ${RM="rm -f"}
|
||||
: ${SED="sed"}
|
||||
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
|
||||
: ${Xsed="$SED -e 1s/^X//"}
|
||||
|
||||
@@ -816,7 +811,7 @@ case $progpath in
|
||||
;;
|
||||
*)
|
||||
save_IFS="$IFS"
|
||||
IFS=:
|
||||
IFS=${PATH_SEPARATOR-:}
|
||||
for progdir in $PATH; do
|
||||
IFS="$save_IFS"
|
||||
test -x "$progdir/$progname" && break
|
||||
@@ -1200,8 +1195,8 @@ func_help ()
|
||||
s*\$LTCFLAGS*'"$LTCFLAGS"'*
|
||||
s*\$LD*'"$LD"'*
|
||||
s/\$with_gnu_ld/'"$with_gnu_ld"'/
|
||||
s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
|
||||
s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
|
||||
s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
|
||||
s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
|
||||
p
|
||||
d
|
||||
}
|
||||
@@ -1478,6 +1473,7 @@ opt_finish=false
|
||||
opt_help=false
|
||||
opt_help_all=false
|
||||
opt_silent=:
|
||||
opt_warning=:
|
||||
opt_verbose=:
|
||||
opt_silent=false
|
||||
opt_verbose=false
|
||||
@@ -1544,6 +1540,10 @@ esac
|
||||
;;
|
||||
--no-silent|--no-quiet)
|
||||
opt_silent=false
|
||||
preserve_args+=" $opt"
|
||||
;;
|
||||
--no-warning|--no-warn)
|
||||
opt_warning=false
|
||||
preserve_args+=" $opt"
|
||||
;;
|
||||
--no-verbose)
|
||||
@@ -2485,7 +2485,7 @@ func_mode_compile ()
|
||||
*.[cCFSifmso] | \
|
||||
*.ada | *.adb | *.ads | *.asm | \
|
||||
*.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
|
||||
*.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
|
||||
*.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
|
||||
func_xform "$libobj"
|
||||
libobj=$func_xform_result
|
||||
;;
|
||||
@@ -3627,11 +3627,13 @@ func_mode_install ()
|
||||
|
||||
# Set up the ranlib parameters.
|
||||
oldlib="$destdir/$name"
|
||||
func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
|
||||
tool_oldlib=$func_to_tool_file_result
|
||||
|
||||
func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
|
||||
|
||||
if test -n "$stripme" && test -n "$old_striplib"; then
|
||||
func_show_eval "$old_striplib $oldlib" 'exit $?'
|
||||
func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
|
||||
fi
|
||||
|
||||
# Do each command in the postinstall commands.
|
||||
@@ -3896,7 +3898,7 @@ static const void *lt_preloaded_setup() {
|
||||
# linked before any other PIC object. But we must not use
|
||||
# pic_flag when linking with -static. The problem exists in
|
||||
# FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
|
||||
*-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
|
||||
*-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
|
||||
pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
|
||||
*-*-hpux*)
|
||||
pic_flag_for_symtable=" $pic_flag" ;;
|
||||
@@ -4408,6 +4410,8 @@ func_exec_program_core ()
|
||||
# launches target application with the remaining arguments.
|
||||
func_exec_program ()
|
||||
{
|
||||
case \" \$* \" in
|
||||
*\\ --lt-*)
|
||||
for lt_wr_arg
|
||||
do
|
||||
case \$lt_wr_arg in
|
||||
@@ -4415,7 +4419,8 @@ func_exec_program ()
|
||||
*) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
done ;;
|
||||
esac
|
||||
func_exec_program_core \${1+\"\$@\"}
|
||||
}
|
||||
|
||||
@@ -5483,9 +5488,15 @@ void lt_dump_script (FILE* f)
|
||||
{
|
||||
EOF
|
||||
func_emit_wrapper yes |
|
||||
$SED -e 's/\([\\"]\)/\\\1/g' \
|
||||
-e 's/^/ fputs ("/' -e 's/$/\\n", f);/'
|
||||
|
||||
$SED -n -e '
|
||||
s/^\(.\{79\}\)\(..*\)/\1\
|
||||
\2/
|
||||
h
|
||||
s/\([\\"]\)/\\\1/g
|
||||
s/$/\\n/
|
||||
s/\([^\n]*\).*/ fputs ("\1", f);/p
|
||||
g
|
||||
D'
|
||||
cat <<"EOF"
|
||||
}
|
||||
EOF
|
||||
@@ -6069,7 +6080,8 @@ func_mode_link ()
|
||||
continue
|
||||
;;
|
||||
|
||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
|
||||
|-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
|
||||
compiler_flags+=" $arg"
|
||||
compile_command+=" $arg"
|
||||
finalize_command+=" $arg"
|
||||
@@ -6573,7 +6585,8 @@ func_mode_link ()
|
||||
lib=
|
||||
found=no
|
||||
case $deplib in
|
||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
|
||||
|-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
|
||||
if test "$linkmode,$pass" = "prog,link"; then
|
||||
compile_deplibs="$deplib $compile_deplibs"
|
||||
finalize_deplibs="$deplib $finalize_deplibs"
|
||||
@@ -7257,7 +7270,7 @@ func_mode_link ()
|
||||
test "$hardcode_direct_absolute" = no; then
|
||||
add="$dir/$linklib"
|
||||
elif test "$hardcode_minus_L" = yes; then
|
||||
add_dir="-L$dir"
|
||||
add_dir="-L$absdir"
|
||||
# Try looking first in the location we're being installed to.
|
||||
if test -n "$inst_prefix_dir"; then
|
||||
case $libdir in
|
||||
@@ -7742,6 +7755,7 @@ func_mode_link ()
|
||||
# which has an extra 1 added just for fun
|
||||
#
|
||||
case $version_type in
|
||||
# correct linux to gnu/linux during the next big refactor
|
||||
darwin|linux|osf|windows|none)
|
||||
func_arith $number_major + $number_minor
|
||||
current=$func_arith_result
|
||||
@@ -7858,7 +7872,7 @@ func_mode_link ()
|
||||
versuffix="$major.$revision"
|
||||
;;
|
||||
|
||||
linux)
|
||||
linux) # correct to gnu/linux during the next big refactor
|
||||
func_arith $current - $age
|
||||
major=.$func_arith_result
|
||||
versuffix="$major.$age.$revision"
|
||||
@@ -8446,6 +8460,11 @@ EOF
|
||||
|
||||
# Test again, we may have decided not to build it any more
|
||||
if test "$build_libtool_libs" = yes; then
|
||||
# Remove ${wl} instances when linking with ld.
|
||||
# FIXME: should test the right _cmds variable.
|
||||
case $archive_cmds in
|
||||
*\$LD\ *) wl= ;;
|
||||
esac
|
||||
if test "$hardcode_into_libs" = yes; then
|
||||
# Hardcode the library paths
|
||||
hardcode_libdirs=
|
||||
@@ -8476,7 +8495,7 @@ EOF
|
||||
elif test -n "$runpath_var"; then
|
||||
case "$perm_rpath " in
|
||||
*" $libdir "*) ;;
|
||||
*) func_apped perm_rpath " $libdir" ;;
|
||||
*) perm_rpath+=" $libdir" ;;
|
||||
esac
|
||||
fi
|
||||
done
|
||||
@@ -8484,11 +8503,7 @@ EOF
|
||||
if test -n "$hardcode_libdir_separator" &&
|
||||
test -n "$hardcode_libdirs"; then
|
||||
libdir="$hardcode_libdirs"
|
||||
if test -n "$hardcode_libdir_flag_spec_ld"; then
|
||||
eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
|
||||
else
|
||||
eval dep_rpath=\"$hardcode_libdir_flag_spec\"
|
||||
fi
|
||||
eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
|
||||
fi
|
||||
if test -n "$runpath_var" && test -n "$perm_rpath"; then
|
||||
# We should set the runpath_var.
|
||||
@@ -9578,6 +9593,8 @@ EOF
|
||||
esac
|
||||
done
|
||||
fi
|
||||
func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
|
||||
tool_oldlib=$func_to_tool_file_result
|
||||
eval cmds=\"$old_archive_cmds\"
|
||||
|
||||
func_len " $cmds"
|
||||
@@ -9687,7 +9704,8 @@ EOF
|
||||
*.la)
|
||||
func_basename "$deplib"
|
||||
name="$func_basename_result"
|
||||
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
|
||||
func_resolve_sysroot "$deplib"
|
||||
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
|
||||
test -z "$libdir" && \
|
||||
func_fatal_error "\`$deplib' is not a valid libtool archive"
|
||||
newdependency_libs+=" ${lt_sysroot:+=}$libdir/$name"
|
||||
+208
-57
@@ -1,8 +1,8 @@
|
||||
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
|
||||
#
|
||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
|
||||
# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
|
||||
# Inc.
|
||||
# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
|
||||
# Foundation, Inc.
|
||||
# Written by Gordon Matzigkeit, 1996
|
||||
#
|
||||
# This file is free software; the Free Software Foundation gives
|
||||
@@ -11,8 +11,8 @@
|
||||
|
||||
m4_define([_LT_COPYING], [dnl
|
||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
|
||||
# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
|
||||
# Inc.
|
||||
# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
|
||||
# Foundation, Inc.
|
||||
# Written by Gordon Matzigkeit, 1996
|
||||
#
|
||||
# This file is part of GNU Libtool.
|
||||
@@ -146,6 +146,8 @@ AC_REQUIRE([AC_CANONICAL_BUILD])dnl
|
||||
AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
|
||||
AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
|
||||
|
||||
_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
|
||||
dnl
|
||||
_LT_DECL([], [host_alias], [0], [The host system])dnl
|
||||
_LT_DECL([], [host], [0])dnl
|
||||
_LT_DECL([], [host_os], [0])dnl
|
||||
@@ -637,7 +639,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
|
||||
m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
|
||||
configured by $[0], generated by m4_PACKAGE_STRING.
|
||||
|
||||
Copyright (C) 2010 Free Software Foundation, Inc.
|
||||
Copyright (C) 2011 Free Software Foundation, Inc.
|
||||
This config.lt script is free software; the Free Software Foundation
|
||||
gives unlimited permision to copy, distribute and modify it."
|
||||
|
||||
@@ -801,6 +803,7 @@ AC_DEFUN([LT_LANG],
|
||||
m4_case([$1],
|
||||
[C], [_LT_LANG(C)],
|
||||
[C++], [_LT_LANG(CXX)],
|
||||
[Go], [_LT_LANG(GO)],
|
||||
[Java], [_LT_LANG(GCJ)],
|
||||
[Fortran 77], [_LT_LANG(F77)],
|
||||
[Fortran], [_LT_LANG(FC)],
|
||||
@@ -822,6 +825,31 @@ m4_defun([_LT_LANG],
|
||||
])# _LT_LANG
|
||||
|
||||
|
||||
m4_ifndef([AC_PROG_GO], [
|
||||
############################################################
|
||||
# NOTE: This macro has been submitted for inclusion into #
|
||||
# GNU Autoconf as AC_PROG_GO. When it is available in #
|
||||
# a released version of Autoconf we should remove this #
|
||||
# macro and use it instead. #
|
||||
############################################################
|
||||
m4_defun([AC_PROG_GO],
|
||||
[AC_LANG_PUSH(Go)dnl
|
||||
AC_ARG_VAR([GOC], [Go compiler command])dnl
|
||||
AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
|
||||
_AC_ARG_VAR_LDFLAGS()dnl
|
||||
AC_CHECK_TOOL(GOC, gccgo)
|
||||
if test -z "$GOC"; then
|
||||
if test -n "$ac_tool_prefix"; then
|
||||
AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
|
||||
fi
|
||||
fi
|
||||
if test -z "$GOC"; then
|
||||
AC_CHECK_PROG(GOC, gccgo, gccgo, false)
|
||||
fi
|
||||
])#m4_defun
|
||||
])#m4_ifndef
|
||||
|
||||
|
||||
# _LT_LANG_DEFAULT_CONFIG
|
||||
# -----------------------
|
||||
m4_defun([_LT_LANG_DEFAULT_CONFIG],
|
||||
@@ -852,6 +880,10 @@ AC_PROVIDE_IFELSE([AC_PROG_GCJ],
|
||||
m4_ifdef([LT_PROG_GCJ],
|
||||
[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
|
||||
|
||||
AC_PROVIDE_IFELSE([AC_PROG_GO],
|
||||
[LT_LANG(GO)],
|
||||
[m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
|
||||
|
||||
AC_PROVIDE_IFELSE([LT_PROG_RC],
|
||||
[LT_LANG(RC)],
|
||||
[m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
|
||||
@@ -954,7 +986,13 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
|
||||
$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
|
||||
-dynamiclib -Wl,-single_module conftest.c 2>conftest.err
|
||||
_lt_result=$?
|
||||
if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
|
||||
# If there is a non-empty error log, and "single_module"
|
||||
# appears in it, assume the flag caused a linker warning
|
||||
if test -s conftest.err && $GREP single_module conftest.err; then
|
||||
cat conftest.err >&AS_MESSAGE_LOG_FD
|
||||
# Otherwise, if the output was created with a 0 exit code from
|
||||
# the compiler, it worked.
|
||||
elif test -f libconftest.dylib && test $_lt_result -eq 0; then
|
||||
lt_cv_apple_cc_single_mod=yes
|
||||
else
|
||||
cat conftest.err >&AS_MESSAGE_LOG_FD
|
||||
@@ -962,6 +1000,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
|
||||
rm -rf libconftest.dylib*
|
||||
rm -f conftest.*
|
||||
fi])
|
||||
|
||||
AC_CACHE_CHECK([for -exported_symbols_list linker flag],
|
||||
[lt_cv_ld_exported_symbols_list],
|
||||
[lt_cv_ld_exported_symbols_list=no
|
||||
@@ -973,6 +1012,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
|
||||
[lt_cv_ld_exported_symbols_list=no])
|
||||
LDFLAGS="$save_LDFLAGS"
|
||||
])
|
||||
|
||||
AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
|
||||
[lt_cv_ld_force_load=no
|
||||
cat > conftest.c << _LT_EOF
|
||||
@@ -990,7 +1030,9 @@ _LT_EOF
|
||||
echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
|
||||
$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
|
||||
_lt_result=$?
|
||||
if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
|
||||
if test -s conftest.err && $GREP force_load conftest.err; then
|
||||
cat conftest.err >&AS_MESSAGE_LOG_FD
|
||||
elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
|
||||
lt_cv_ld_force_load=yes
|
||||
else
|
||||
cat conftest.err >&AS_MESSAGE_LOG_FD
|
||||
@@ -1035,8 +1077,8 @@ _LT_EOF
|
||||
])
|
||||
|
||||
|
||||
# _LT_DARWIN_LINKER_FEATURES
|
||||
# --------------------------
|
||||
# _LT_DARWIN_LINKER_FEATURES([TAG])
|
||||
# ---------------------------------
|
||||
# Checks for linker and compiler features on darwin
|
||||
m4_defun([_LT_DARWIN_LINKER_FEATURES],
|
||||
[
|
||||
@@ -1047,6 +1089,8 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
|
||||
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
|
||||
if test "$lt_cv_ld_force_load" = "yes"; then
|
||||
_LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
|
||||
m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
|
||||
[FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes])
|
||||
else
|
||||
_LT_TAGVAR(whole_archive_flag_spec, $1)=''
|
||||
fi
|
||||
@@ -1330,14 +1374,27 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
|
||||
CFLAGS="$SAVE_CFLAGS"
|
||||
fi
|
||||
;;
|
||||
sparc*-*solaris*)
|
||||
*-*solaris*)
|
||||
# Find out which ABI we are using.
|
||||
echo 'int i;' > conftest.$ac_ext
|
||||
if AC_TRY_EVAL(ac_compile); then
|
||||
case `/usr/bin/file conftest.o` in
|
||||
*64-bit*)
|
||||
case $lt_cv_prog_gnu_ld in
|
||||
yes*) LD="${LD-ld} -m elf64_sparc" ;;
|
||||
yes*)
|
||||
case $host in
|
||||
i?86-*-solaris*)
|
||||
LD="${LD-ld} -m elf_x86_64"
|
||||
;;
|
||||
sparc*-*-solaris*)
|
||||
LD="${LD-ld} -m elf64_sparc"
|
||||
;;
|
||||
esac
|
||||
# GNU ld 2.21 introduced _sol2 emulations. Use them if available.
|
||||
if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
|
||||
LD="${LD-ld}_sol2"
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
|
||||
LD="${LD-ld} -64"
|
||||
@@ -1414,13 +1471,13 @@ old_postuninstall_cmds=
|
||||
if test -n "$RANLIB"; then
|
||||
case $host_os in
|
||||
openbsd*)
|
||||
old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
|
||||
old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
|
||||
;;
|
||||
*)
|
||||
old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
|
||||
old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
|
||||
;;
|
||||
esac
|
||||
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
|
||||
old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
|
||||
fi
|
||||
|
||||
case $host_os in
|
||||
@@ -1600,6 +1657,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
|
||||
lt_cv_sys_max_cmd_len=196608
|
||||
;;
|
||||
|
||||
os2*)
|
||||
# The test takes a long time on OS/2.
|
||||
lt_cv_sys_max_cmd_len=8192
|
||||
;;
|
||||
|
||||
osf*)
|
||||
# Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
|
||||
# due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
|
||||
@@ -1639,7 +1701,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
|
||||
# If test is not a shell built-in, we'll probably end up computing a
|
||||
# maximum length that is only half of the actual maximum length, but
|
||||
# we can't tell.
|
||||
while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
|
||||
while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
|
||||
= "X$teststring$teststring"; } >/dev/null 2>&1 &&
|
||||
test $i != 17 # 1/2 MB should be enough
|
||||
do
|
||||
@@ -2185,7 +2247,7 @@ need_version=unknown
|
||||
|
||||
case $host_os in
|
||||
aix3*)
|
||||
version_type=linux
|
||||
version_type=linux # correct to gnu/linux during the next big refactor
|
||||
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
|
||||
shlibpath_var=LIBPATH
|
||||
|
||||
@@ -2194,7 +2256,7 @@ aix3*)
|
||||
;;
|
||||
|
||||
aix[[4-9]]*)
|
||||
version_type=linux
|
||||
version_type=linux # correct to gnu/linux during the next big refactor
|
||||
need_lib_prefix=no
|
||||
need_version=no
|
||||
hardcode_into_libs=yes
|
||||
@@ -2259,7 +2321,7 @@ beos*)
|
||||
;;
|
||||
|
||||
bsdi[[45]]*)
|
||||
version_type=linux
|
||||
version_type=linux # correct to gnu/linux during the next big refactor
|
||||
need_version=no
|
||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
||||
soname_spec='${libname}${release}${shared_ext}$major'
|
||||
@@ -2398,7 +2460,7 @@ m4_if([$1], [],[
|
||||
;;
|
||||
|
||||
dgux*)
|
||||
version_type=linux
|
||||
version_type=linux # correct to gnu/linux during the next big refactor
|
||||
need_lib_prefix=no
|
||||
need_version=no
|
||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
|
||||
@@ -2406,10 +2468,6 @@ dgux*)
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
;;
|
||||
|
||||
freebsd1*)
|
||||
dynamic_linker=no
|
||||
;;
|
||||
|
||||
freebsd* | dragonfly*)
|
||||
# DragonFly does not have aout. When/if they implement a new
|
||||
# versioning mechanism, adjust this.
|
||||
@@ -2417,7 +2475,7 @@ freebsd* | dragonfly*)
|
||||
objformat=`/usr/bin/objformat`
|
||||
else
|
||||
case $host_os in
|
||||
freebsd[[123]]*) objformat=aout ;;
|
||||
freebsd[[23]].*) objformat=aout ;;
|
||||
*) objformat=elf ;;
|
||||
esac
|
||||
fi
|
||||
@@ -2435,7 +2493,7 @@ freebsd* | dragonfly*)
|
||||
esac
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
case $host_os in
|
||||
freebsd2*)
|
||||
freebsd2.*)
|
||||
shlibpath_overrides_runpath=yes
|
||||
;;
|
||||
freebsd3.[[01]]* | freebsdelf3.[[01]]*)
|
||||
@@ -2455,17 +2513,18 @@ freebsd* | dragonfly*)
|
||||
;;
|
||||
|
||||
gnu*)
|
||||
version_type=linux
|
||||
version_type=linux # correct to gnu/linux during the next big refactor
|
||||
need_lib_prefix=no
|
||||
need_version=no
|
||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
|
||||
soname_spec='${libname}${release}${shared_ext}$major'
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
shlibpath_overrides_runpath=no
|
||||
hardcode_into_libs=yes
|
||||
;;
|
||||
|
||||
haiku*)
|
||||
version_type=linux
|
||||
version_type=linux # correct to gnu/linux during the next big refactor
|
||||
need_lib_prefix=no
|
||||
need_version=no
|
||||
dynamic_linker="$host_os runtime_loader"
|
||||
@@ -2526,7 +2585,7 @@ hpux9* | hpux10* | hpux11*)
|
||||
;;
|
||||
|
||||
interix[[3-9]]*)
|
||||
version_type=linux
|
||||
version_type=linux # correct to gnu/linux during the next big refactor
|
||||
need_lib_prefix=no
|
||||
need_version=no
|
||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
||||
@@ -2542,7 +2601,7 @@ irix5* | irix6* | nonstopux*)
|
||||
nonstopux*) version_type=nonstopux ;;
|
||||
*)
|
||||
if test "$lt_cv_prog_gnu_ld" = yes; then
|
||||
version_type=linux
|
||||
version_type=linux # correct to gnu/linux during the next big refactor
|
||||
else
|
||||
version_type=irix
|
||||
fi ;;
|
||||
@@ -2579,9 +2638,9 @@ linux*oldld* | linux*aout* | linux*coff*)
|
||||
dynamic_linker=no
|
||||
;;
|
||||
|
||||
# This must be Linux ELF.
|
||||
# This must be glibc/ELF.
|
||||
linux* | k*bsd*-gnu | kopensolaris*-gnu)
|
||||
version_type=linux
|
||||
version_type=linux # correct to gnu/linux during the next big refactor
|
||||
need_lib_prefix=no
|
||||
need_version=no
|
||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
||||
@@ -2644,7 +2703,7 @@ netbsd*)
|
||||
;;
|
||||
|
||||
newsos6)
|
||||
version_type=linux
|
||||
version_type=linux # correct to gnu/linux during the next big refactor
|
||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
shlibpath_overrides_runpath=yes
|
||||
@@ -2713,7 +2772,7 @@ rdos*)
|
||||
;;
|
||||
|
||||
solaris*)
|
||||
version_type=linux
|
||||
version_type=linux # correct to gnu/linux during the next big refactor
|
||||
need_lib_prefix=no
|
||||
need_version=no
|
||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
||||
@@ -2738,7 +2797,7 @@ sunos4*)
|
||||
;;
|
||||
|
||||
sysv4 | sysv4.3*)
|
||||
version_type=linux
|
||||
version_type=linux # correct to gnu/linux during the next big refactor
|
||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
||||
soname_spec='${libname}${release}${shared_ext}$major'
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
@@ -2762,7 +2821,7 @@ sysv4 | sysv4.3*)
|
||||
|
||||
sysv4*MP*)
|
||||
if test -d /usr/nec ;then
|
||||
version_type=linux
|
||||
version_type=linux # correct to gnu/linux during the next big refactor
|
||||
library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
|
||||
soname_spec='$libname${shared_ext}.$major'
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
@@ -2793,7 +2852,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
|
||||
|
||||
tpf*)
|
||||
# TPF is a cross-target only. Preferred cross-host = GNU/Linux.
|
||||
version_type=linux
|
||||
version_type=linux # correct to gnu/linux during the next big refactor
|
||||
need_lib_prefix=no
|
||||
need_version=no
|
||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
||||
@@ -2803,7 +2862,7 @@ tpf*)
|
||||
;;
|
||||
|
||||
uts4*)
|
||||
version_type=linux
|
||||
version_type=linux # correct to gnu/linux during the next big refactor
|
||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
||||
soname_spec='${libname}${release}${shared_ext}$major'
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
@@ -3225,7 +3284,7 @@ irix5* | irix6* | nonstopux*)
|
||||
lt_cv_deplibs_check_method=pass_all
|
||||
;;
|
||||
|
||||
# This must be Linux ELF.
|
||||
# This must be glibc/ELF.
|
||||
linux* | k*bsd*-gnu | kopensolaris*-gnu)
|
||||
lt_cv_deplibs_check_method=pass_all
|
||||
;;
|
||||
@@ -3645,6 +3704,7 @@ for ac_symprfx in "" "_"; do
|
||||
# which start with @ or ?.
|
||||
lt_cv_sys_global_symbol_pipe="$AWK ['"\
|
||||
" {last_section=section; section=\$ 3};"\
|
||||
" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
|
||||
" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
|
||||
" \$ 0!~/External *\|/{next};"\
|
||||
" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
|
||||
@@ -4229,7 +4289,9 @@ m4_if([$1], [CXX], [
|
||||
case $cc_basename in
|
||||
nvcc*) # Cuda Compiler Driver 2.2
|
||||
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
|
||||
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
|
||||
if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
|
||||
_LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
else
|
||||
@@ -4321,18 +4383,33 @@ m4_if([$1], [CXX], [
|
||||
;;
|
||||
*)
|
||||
case `$CC -V 2>&1 | sed 5q` in
|
||||
*Sun\ F* | *Sun*Fortran*)
|
||||
*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
|
||||
# Sun Fortran 8.3 passes all unrecognized flags to the linker
|
||||
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
|
||||
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
|
||||
_LT_TAGVAR(lt_prog_compiler_wl, $1)=''
|
||||
;;
|
||||
*Sun\ F* | *Sun*Fortran*)
|
||||
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
|
||||
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
|
||||
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
|
||||
;;
|
||||
*Sun\ C*)
|
||||
# Sun C 5.9
|
||||
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
|
||||
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
|
||||
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
|
||||
;;
|
||||
*Intel*\ [[CF]]*Compiler*)
|
||||
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
|
||||
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
|
||||
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
|
||||
;;
|
||||
*Portland\ Group*)
|
||||
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
|
||||
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
|
||||
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
@@ -4492,7 +4569,9 @@ m4_if([$1], [CXX], [
|
||||
;;
|
||||
cygwin* | mingw* | cegcc*)
|
||||
case $cc_basename in
|
||||
cl*) ;;
|
||||
cl*)
|
||||
_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
|
||||
;;
|
||||
*)
|
||||
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
|
||||
_LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
|
||||
@@ -4517,7 +4596,6 @@ m4_if([$1], [CXX], [
|
||||
_LT_TAGVAR(hardcode_direct, $1)=no
|
||||
_LT_TAGVAR(hardcode_direct_absolute, $1)=no
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
|
||||
_LT_TAGVAR(hardcode_libdir_separator, $1)=
|
||||
_LT_TAGVAR(hardcode_minus_L, $1)=no
|
||||
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
|
||||
@@ -4768,8 +4846,7 @@ _LT_EOF
|
||||
xlf* | bgf* | bgxlf* | mpixlf*)
|
||||
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
|
||||
_LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
|
||||
_LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
|
||||
if test "x$supports_anon_versioning" = xyes; then
|
||||
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
|
||||
@@ -5064,6 +5141,7 @@ _LT_EOF
|
||||
# The linker will not automatically build a static lib if we build a DLL.
|
||||
# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
|
||||
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
|
||||
_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
|
||||
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
|
||||
# Don't use ranlib
|
||||
_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
|
||||
@@ -5110,10 +5188,6 @@ _LT_EOF
|
||||
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
|
||||
;;
|
||||
|
||||
freebsd1*)
|
||||
_LT_TAGVAR(ld_shlibs, $1)=no
|
||||
;;
|
||||
|
||||
# FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
|
||||
# support. Future versions do this automatically, but an explicit c++rt0.o
|
||||
# does not break anything, and helps significantly (at the cost of a little
|
||||
@@ -5126,7 +5200,7 @@ _LT_EOF
|
||||
;;
|
||||
|
||||
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
|
||||
freebsd2*)
|
||||
freebsd2.*)
|
||||
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
|
||||
_LT_TAGVAR(hardcode_direct, $1)=yes
|
||||
_LT_TAGVAR(hardcode_minus_L, $1)=yes
|
||||
@@ -5165,7 +5239,6 @@ _LT_EOF
|
||||
fi
|
||||
if test "$with_gnu_ld" = no; then
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
|
||||
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
|
||||
_LT_TAGVAR(hardcode_direct, $1)=yes
|
||||
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
|
||||
@@ -5607,9 +5680,6 @@ _LT_TAGDECL([], [no_undefined_flag], [1],
|
||||
_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
|
||||
[Flag to hardcode $libdir into a binary during linking.
|
||||
This must work even if $libdir does not exist])
|
||||
_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
|
||||
[[If ld is used when linking, flag to hardcode $libdir into a binary
|
||||
during linking. This must work even if $libdir does not exist]])
|
||||
_LT_TAGDECL([], [hardcode_libdir_separator], [1],
|
||||
[Whether we need a single "-rpath" flag with a separated argument])
|
||||
_LT_TAGDECL([], [hardcode_direct], [0],
|
||||
@@ -5767,7 +5837,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
|
||||
_LT_TAGVAR(hardcode_direct, $1)=no
|
||||
_LT_TAGVAR(hardcode_direct_absolute, $1)=no
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
|
||||
_LT_TAGVAR(hardcode_libdir_separator, $1)=
|
||||
_LT_TAGVAR(hardcode_minus_L, $1)=no
|
||||
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
|
||||
@@ -6137,7 +6206,7 @@ if test "$_lt_caught_CXX_error" != yes; then
|
||||
esac
|
||||
;;
|
||||
|
||||
freebsd[[12]]*)
|
||||
freebsd2.*)
|
||||
# C++ shared libraries reported to be fairly broken before
|
||||
# switch to ELF
|
||||
_LT_TAGVAR(ld_shlibs, $1)=no
|
||||
@@ -6898,12 +6967,18 @@ public class foo {
|
||||
}
|
||||
};
|
||||
_LT_EOF
|
||||
], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
|
||||
package foo
|
||||
func foo() {
|
||||
}
|
||||
_LT_EOF
|
||||
])
|
||||
|
||||
_lt_libdeps_save_CFLAGS=$CFLAGS
|
||||
case "$CC $CFLAGS " in #(
|
||||
*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
|
||||
*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
|
||||
*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
|
||||
esac
|
||||
|
||||
dnl Parse the compiler output and extract the necessary
|
||||
@@ -7100,7 +7175,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
|
||||
_LT_TAGVAR(hardcode_direct, $1)=no
|
||||
_LT_TAGVAR(hardcode_direct_absolute, $1)=no
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
|
||||
_LT_TAGVAR(hardcode_libdir_separator, $1)=
|
||||
_LT_TAGVAR(hardcode_minus_L, $1)=no
|
||||
_LT_TAGVAR(hardcode_automatic, $1)=no
|
||||
@@ -7233,7 +7307,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
|
||||
_LT_TAGVAR(hardcode_direct, $1)=no
|
||||
_LT_TAGVAR(hardcode_direct_absolute, $1)=no
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
|
||||
_LT_TAGVAR(hardcode_libdir_separator, $1)=
|
||||
_LT_TAGVAR(hardcode_minus_L, $1)=no
|
||||
_LT_TAGVAR(hardcode_automatic, $1)=no
|
||||
@@ -7420,6 +7493,77 @@ CFLAGS=$lt_save_CFLAGS
|
||||
])# _LT_LANG_GCJ_CONFIG
|
||||
|
||||
|
||||
# _LT_LANG_GO_CONFIG([TAG])
|
||||
# --------------------------
|
||||
# Ensure that the configuration variables for the GNU Go compiler
|
||||
# are suitably defined. These variables are subsequently used by _LT_CONFIG
|
||||
# to write the compiler configuration to `libtool'.
|
||||
m4_defun([_LT_LANG_GO_CONFIG],
|
||||
[AC_REQUIRE([LT_PROG_GO])dnl
|
||||
AC_LANG_SAVE
|
||||
|
||||
# Source file extension for Go test sources.
|
||||
ac_ext=go
|
||||
|
||||
# Object file extension for compiled Go test sources.
|
||||
objext=o
|
||||
_LT_TAGVAR(objext, $1)=$objext
|
||||
|
||||
# Code to be used in simple compile tests
|
||||
lt_simple_compile_test_code="package main; func main() { }"
|
||||
|
||||
# Code to be used in simple link tests
|
||||
lt_simple_link_test_code='package main; func main() { }'
|
||||
|
||||
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
|
||||
_LT_TAG_COMPILER
|
||||
|
||||
# save warnings/boilerplate of simple test code
|
||||
_LT_COMPILER_BOILERPLATE
|
||||
_LT_LINKER_BOILERPLATE
|
||||
|
||||
# Allow CC to be a program name with arguments.
|
||||
lt_save_CC=$CC
|
||||
lt_save_CFLAGS=$CFLAGS
|
||||
lt_save_GCC=$GCC
|
||||
GCC=yes
|
||||
CC=${GOC-"gccgo"}
|
||||
CFLAGS=$GOFLAGS
|
||||
compiler=$CC
|
||||
_LT_TAGVAR(compiler, $1)=$CC
|
||||
_LT_TAGVAR(LD, $1)="$LD"
|
||||
_LT_CC_BASENAME([$compiler])
|
||||
|
||||
# Go did not exist at the time GCC didn't implicitly link libc in.
|
||||
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
|
||||
|
||||
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
|
||||
_LT_TAGVAR(reload_flag, $1)=$reload_flag
|
||||
_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
|
||||
|
||||
## CAVEAT EMPTOR:
|
||||
## There is no encapsulation within the following macros, do not change
|
||||
## the running order or otherwise move them around unless you know exactly
|
||||
## what you are doing...
|
||||
if test -n "$compiler"; then
|
||||
_LT_COMPILER_NO_RTTI($1)
|
||||
_LT_COMPILER_PIC($1)
|
||||
_LT_COMPILER_C_O($1)
|
||||
_LT_COMPILER_FILE_LOCKS($1)
|
||||
_LT_LINKER_SHLIBS($1)
|
||||
_LT_LINKER_HARDCODE_LIBPATH($1)
|
||||
|
||||
_LT_CONFIG($1)
|
||||
fi
|
||||
|
||||
AC_LANG_RESTORE
|
||||
|
||||
GCC=$lt_save_GCC
|
||||
CC=$lt_save_CC
|
||||
CFLAGS=$lt_save_CFLAGS
|
||||
])# _LT_LANG_GO_CONFIG
|
||||
|
||||
|
||||
# _LT_LANG_RC_CONFIG([TAG])
|
||||
# -------------------------
|
||||
# Ensure that the configuration variables for the Windows resource compiler
|
||||
@@ -7489,6 +7633,13 @@ dnl aclocal-1.4 backwards compatibility:
|
||||
dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
|
||||
|
||||
|
||||
# LT_PROG_GO
|
||||
# ----------
|
||||
AC_DEFUN([LT_PROG_GO],
|
||||
[AC_CHECK_TOOL(GOC, gccgo,)
|
||||
])
|
||||
|
||||
|
||||
# LT_PROG_RC
|
||||
# ----------
|
||||
AC_DEFUN([LT_PROG_RC],
|
||||
@@ -326,9 +326,24 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
|
||||
# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
|
||||
m4_define([_LT_WITH_PIC],
|
||||
[AC_ARG_WITH([pic],
|
||||
[AS_HELP_STRING([--with-pic],
|
||||
[AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
|
||||
[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
|
||||
[pic_mode="$withval"],
|
||||
[lt_p=${PACKAGE-default}
|
||||
case $withval in
|
||||
yes|no) pic_mode=$withval ;;
|
||||
*)
|
||||
pic_mode=default
|
||||
# Look at the argument we got. We use all the common list separators.
|
||||
lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
|
||||
for lt_pkg in $withval; do
|
||||
IFS="$lt_save_ifs"
|
||||
if test "X$lt_pkg" = "X$lt_p"; then
|
||||
pic_mode=yes
|
||||
fi
|
||||
done
|
||||
IFS="$lt_save_ifs"
|
||||
;;
|
||||
esac],
|
||||
[pic_mode=default])
|
||||
|
||||
test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
|
||||
@@ -9,15 +9,15 @@
|
||||
|
||||
# @configure_input@
|
||||
|
||||
# serial 3293 ltversion.m4
|
||||
# serial 3337 ltversion.m4
|
||||
# This file is part of GNU Libtool
|
||||
|
||||
m4_define([LT_PACKAGE_VERSION], [2.4])
|
||||
m4_define([LT_PACKAGE_REVISION], [1.3293])
|
||||
m4_define([LT_PACKAGE_VERSION], [2.4.2])
|
||||
m4_define([LT_PACKAGE_REVISION], [1.3337])
|
||||
|
||||
AC_DEFUN([LTVERSION_VERSION],
|
||||
[macro_version='2.4'
|
||||
macro_revision='1.3293'
|
||||
[macro_version='2.4.2'
|
||||
macro_revision='1.3337'
|
||||
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
|
||||
_LT_DECL(, macro_revision, 0)
|
||||
])
|
||||
@@ -1,4 +1,4 @@
|
||||
.TH mpg123 1 "31 Jan 2008"
|
||||
.TH mpg123 1 "22 Apr 2012"
|
||||
.SH NAME
|
||||
mpg123 \- play audio MPEG 1.0/2.0/2.5 stream (layers 1, 2 and 3)
|
||||
.SH SYNOPSIS
|
||||
@@ -63,8 +63,9 @@ With this switch you can make it bail out on data errors
|
||||
The old name still works, but is not advertised or recommened to use (subject to removal in future).
|
||||
.TP
|
||||
\fB\-\^-resync\-limit \fIbytes\fR
|
||||
Set number of bytes to search for valid MPEG data; <0 means search whole stream.
|
||||
Set number of bytes to search for valid MPEG data once lost in stream; <0 means search whole stream.
|
||||
If you know there are huge chunks of invalid data in your files... here is your hammer.
|
||||
Note: Only since version 1.14 this also increases the amount of junk skipped on beginning.
|
||||
.TP
|
||||
\fB\-p \fIURL \fR| \fBnone\fR, \fB\-\^\-proxy \fIURL \fR| \fBnone
|
||||
The specified
|
||||
@@ -82,6 +83,14 @@ from the respective servers. See also the
|
||||
HTTP authentication to use when recieving files via HTTP.
|
||||
The format used is user:password.
|
||||
.TP
|
||||
\fB\-\^\-ignore\-mime
|
||||
Ignore MIME types given by HTTP server. If you know better and want mpg123
|
||||
to decode something the server thinks is image/png, then just do it.
|
||||
.TP
|
||||
\fB\-\^\-no\-seekbuffer
|
||||
Disable the default micro-buffering of non-seekable streams that gives the
|
||||
parser a safer footing.
|
||||
.TP
|
||||
\fB\-@ \fIfile\fR, \fB\-\^\-list \fIfile
|
||||
Read filenames and/or URLs of MPEG audio streams from the specified
|
||||
.I file
|
||||
@@ -101,8 +110,13 @@ Of the playlist, play specified entry only.
|
||||
.I n
|
||||
is the number of entry starting at 1. A value of 0 is the default and means playling the whole list, a negative value means showing of the list of titles with their numbers...
|
||||
.TP
|
||||
\fB\-\^\-continue
|
||||
Enable playlist continuation mode. This changes frame skipping to apply only to the first track and also continues to play following tracks in playlist after the selected one. Also, the option to play a number of frames only applies to the whole playlist. Basically, this tries to treat the playlist more like one big stream (like, an audio book).
|
||||
The current track number in list (1-based) and frame number (0-based) are printed at exit (useful if you interrupted playback and want to continue later).
|
||||
Note that the continuation info is printed to standard output unless the switch for piping audio data to standard out is used. Also, it really makes sense to work with actual playlist files instead of lists of file names as arguments, to keep track positions consistent.
|
||||
.TP
|
||||
\fB\-\-loop \fItimes\fR
|
||||
for looping track(s) a certain number of times, < 0 means infinite loop (not with --random!).
|
||||
for looping track(s) a certain number of times, < 0 means infinite loop (not with \-\-random!).
|
||||
.TP
|
||||
.BR \-\-keep\-open
|
||||
For remote control mode: Keep loaded file open after reaching end.
|
||||
@@ -170,13 +184,13 @@ is used as file name. You can also use
|
||||
.I --au
|
||||
and
|
||||
.I --cdr
|
||||
for AU and CDR format, respectively.
|
||||
for AU and CDR format, respectively. Note that WAV/AU writing to non-seekable files, or redirected stdout, needs some thought. Since 1.16.0, the logic changed to writing the header with the first actual data. This avoids spurious WAV headers in a pipe, for example. The result of decoding nothing to WAV/AU is a file consisting just of the header when it is seekable and really nothing when not (not even a header). Correctly writing data with prophetic headers to stdout is no easy business.
|
||||
.TP
|
||||
\fB\-\^\-au \fIfile
|
||||
Does not play the MPEG file but writes it to
|
||||
.I file
|
||||
in SUN audio format. If \- is used as the filename, the AU file is
|
||||
written to stdout.
|
||||
written to stdout. See paragraph about WAV writing for header fun with non-seekable streams.
|
||||
.TP
|
||||
\fB\-\^\-cdr \fIfile
|
||||
Does not play the MPEG file but writes it to
|
||||
@@ -227,7 +241,7 @@ Force stereo output
|
||||
.TP
|
||||
\fB\-r \fIrate\fR, \fB\-\^\-rate \fIrate
|
||||
Set sample rate (default: automatic). You may want to
|
||||
change this if you need a constant bitrate independed of
|
||||
change this if you need a constant bitrate independent of
|
||||
the mpeg stream rate. mpg123 automagically converts the
|
||||
rate. You should then combine this with \-\-stereo or \-\-mono.
|
||||
.TP
|
||||
@@ -242,6 +256,13 @@ Set hardware pitch (speedup/down, 0 is neutral; 0.05 is 5%). This changes the ou
|
||||
.BR \-\-8bit
|
||||
Forces 8bit output
|
||||
.TP
|
||||
\fB\-\^\-float
|
||||
Forces f32 encoding
|
||||
.TP
|
||||
\fp\-e \fIenc\fR, \fB\-\^\-encoding \fIenc
|
||||
Choose output sample encoding. Possible values look like f32 (32-bit floating point), s32 (32-bit signed integer), u32 (32-bit unsigned integer) and the variants with different numbers of bits (s24, u24, s16, u16, s8, u8) and also special variants like ulaw and alaw 8-bit.
|
||||
See the output of mpg123's longhelp for actually available encodings.
|
||||
.TP
|
||||
\fB\-d \fIn\fR, \fB\-\^\-doublespeed \fIn
|
||||
Only play every
|
||||
.IR n 'th
|
||||
@@ -340,7 +361,7 @@ beginning of the song, ',' to rewind, '.' to fast forward, and 'q' to quit.
|
||||
Type 'h' for a full list of available controls.
|
||||
.TP
|
||||
\fB\-\^\-title
|
||||
In an xterm, or rxvt (compatible, TERM environment variable is examined), change the window's title to the name of song currently
|
||||
In an xterm, rxvt, screen, iris-ansi (compatible, TERM environment variable is examined), change the window's title to the name of song currently
|
||||
playing.
|
||||
.TP
|
||||
\fB\-\^\-long\-tag
|
||||
@@ -4,7 +4,7 @@
|
||||
# - devel packages for alsa, sdl, etc... to build the respective output modules.
|
||||
Summary: The fast console mpeg audio decoder/player.
|
||||
Name: mpg123
|
||||
Version: 1.13.4
|
||||
Version: 1.17.0
|
||||
Release: 1
|
||||
URL: http://www.mpg123.org/
|
||||
License: GPL
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user