Skip to content

L
libva-utils
Commit af6fd4cf authored by Matteo F. Vescovi's avatar Matteo F. Vescovi
Browse files
Options

Imported Upstream version 1.1.0

parent 6afc50bd
Hide whitespace changes
Inline Side-by-side
Showing with 23256 additions and 11638 deletions
Makefile.am
View file @ af6fd4cf
......@@ -20,9 +20,11 @@
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
AUTOMAKE_OPTIONS = foreign
SUBDIRS = va dummy_drv_video pkgconfig test debian.upstream
SUBDIRS = va dummy_drv_video pkgconfig test debian.upstream doc
# Extra clean files so that maintainer-clean removes *everything*
MAINTAINERCLEANFILES = \
......
Makefile.in
View file @ af6fd4cf
......@@ -61,7 +61,10 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
$(top_srcdir)/configure COPYING NEWS compile config.guess \
config.sub depcomp install-sh ltmain.sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
......@@ -154,6 +157,7 @@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DOXYGEN = @DOXYGEN@
DRM_CFLAGS = @DRM_CFLAGS@
DRM_LIBS = @DRM_LIBS@
DSYMUTIL = @DSYMUTIL@
......@@ -161,11 +165,13 @@ DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGL_CFLAGS = @EGL_CFLAGS@
EGL_LIBS = @EGL_LIBS@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
GL_DEPS_CFLAGS = @GL_DEPS_CFLAGS@
GL_DEPS_LIBS = @GL_DEPS_LIBS@
GLX_CFLAGS = @GLX_CFLAGS@
GLX_LIBS = @GLX_LIBS@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
......@@ -178,9 +184,7 @@ LIBDRM_VERSION = @LIBDRM_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBVA_CFLAGS = @LIBVA_CFLAGS@
LIBVA_DRIVERS_PATH = @LIBVA_DRIVERS_PATH@
LIBVA_LIBS = @LIBVA_LIBS@
LIBVA_LT_LDFLAGS = @LIBVA_LT_LDFLAGS@
LIBVA_LT_VERSION = @LIBVA_LT_VERSION@
LIBVA_MAJOR_VERSION = @LIBVA_MAJOR_VERSION@
......@@ -215,13 +219,15 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
UDEV_CFLAGS = @UDEV_CFLAGS@
UDEV_LIBS = @UDEV_LIBS@
TODAY = @TODAY@
VA_API_MAJOR_VERSION = @VA_API_MAJOR_VERSION@
VA_API_MICRO_VERSION = @VA_API_MICRO_VERSION@
VA_API_MINOR_VERSION = @VA_API_MINOR_VERSION@
VA_API_VERSION = @VA_API_VERSION@
VERSION = @VERSION@
WAYLAND_API_VERSION = @WAYLAND_API_VERSION@
WAYLAND_CFLAGS = @WAYLAND_CFLAGS@
WAYLAND_LIBS = @WAYLAND_LIBS@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XEXT_CFLAGS = @XEXT_CFLAGS@
......@@ -264,8 +270,6 @@ infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
libvabackendlib = @libvabackendlib@
libvacorelib = @libvacorelib@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
......@@ -284,8 +288,11 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
wayland_protocoldir = @wayland_protocoldir@
wayland_scanner = @wayland_scanner@
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
AUTOMAKE_OPTIONS = foreign
SUBDIRS = va dummy_drv_video pkgconfig test debian.upstream
SUBDIRS = va dummy_drv_video pkgconfig test debian.upstream doc
# Extra clean files so that maintainer-clean removes *everything*
MAINTAINERCLEANFILES = \
......
NEWS
View file @ af6fd4cf
libva NEWS -- summary of user visible changes. 2012-08-02
libva NEWS -- summary of user visible changes. 2012-10-04
Copyright (C) 2009-2011 Intel Corporation
Version 1.1.0 - 04.Oct.2012
* API: add Wayland support
* API: add raw DRM support for headless pipelines
* Fix generic VA/GLX implementation for newer cluttersink versions
* Fix threading issues in VA objects reference code (+Krzysztof Kotlenga)
* Fix build on Android Ice Cream Sandwich (+Haitao Huang, Daniel Charles)
Version 1.0.16 - 02.Aug.2012
* API: data structures for JPEG Baseline decoding
* API: clarify the definition of slice_data_bit_offset
......
aclocal.m4
View file @ af6fd4cf
This source diff could not be displayed because it is too large. You can view the blob instead.
config.h.in
View file @ af6fd4cf
......@@ -3,12 +3,18 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
/* Define to 1 if you have the <EGL/egl.h> header file. */
#undef HAVE_EGL_EGL_H
/* Define to 1 if you have the <GL/glx.h> header file. */
#undef HAVE_GL_GLX_H
/* Define to 1 if you have the <GL/gl.h> header file. */
#undef HAVE_GL_GL_H
/* Defined to 1 if GCC visibility attribute is supported */
#undef HAVE_GNUC_VISIBILITY_ATTRIBUTE
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
......@@ -36,10 +42,28 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Defined to 1 if VA/DRM API is built */
#undef HAVE_VA_DRM
/* Defined to 1 if VA/EGL API is built */
#undef HAVE_VA_EGL
/* Defined to 1 if VA/GLX API is built */
#undef HAVE_VA_GLX
/* Defined to 1 if VA/Wayland API is built */
#undef HAVE_VA_WAYLAND
/* Defined to 1 if VA/X11 API is built */
#undef HAVE_VA_X11
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
#undef LT_OBJDIR
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
#undef NO_MINUS_C_MINUS_O
/* Name of package */
#undef PACKAGE
......
configure
View file @ af6fd4cf
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for libva 1.0.16.
# Generated by GNU Autoconf 2.68 for libva 1.1.0.
#
# Report bugs to <waldo.bastian@intel.com>.
#
......@@ -570,8 +570,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libva'
PACKAGE_TARNAME='libva'
PACKAGE_VERSION='1.0.16'
PACKAGE_STRING='libva 1.0.16'
PACKAGE_VERSION='1.1.0'
PACKAGE_STRING='libva 1.1.0'
PACKAGE_BUGREPORT='waldo.bastian@intel.com'
PACKAGE_URL=''
......@@ -616,30 +616,38 @@ ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
libvabackendlib
libvacorelib
pkgconfigdir
LIBVA_LIBS
LIBVA_CFLAGS
wayland_protocoldir
wayland_scanner
USE_WAYLAND_FALSE
USE_WAYLAND_TRUE
WAYLAND_LIBS
WAYLAND_CFLAGS
WAYLAND_API_VERSION
USE_EGL_FALSE
USE_EGL_TRUE
EGL_LIBS
EGL_CFLAGS
USE_GLX_FALSE
USE_GLX_TRUE
GL_DEPS_LIBS
GL_DEPS_CFLAGS
BUILD_DUMMY_BACKEND_FALSE
BUILD_DUMMY_BACKEND_TRUE
UDEV_LIBS
UDEV_CFLAGS
LIBDRM_VERSION
DRM_LIBS
DRM_CFLAGS
GLX_LIBS
GLX_CFLAGS
USE_X11_FALSE
USE_X11_TRUE
XFIXES_LIBS
XFIXES_CFLAGS
XEXT_LIBS
XEXT_CFLAGS
X11_LIBS
X11_CFLAGS
USE_DRM_FALSE
USE_DRM_TRUE
LIBDRM_VERSION
DRM_LIBS
DRM_CFLAGS
ENABLE_DOCS_FALSE
ENABLE_DOCS_TRUE
DOXYGEN
PKG_CONFIG_LIBDIR
PKG_CONFIG_PATH
PKG_CONFIG
......@@ -710,6 +718,7 @@ VA_API_VERSION
VA_API_MICRO_VERSION
VA_API_MINOR_VERSION
VA_API_MAJOR_VERSION
TODAY
AM_BACKSLASH
AM_DEFAULT_VERBOSITY
AM_DEFAULT_V
......@@ -775,13 +784,17 @@ PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
SHELL'
ac_subst_files=''
ac_subst_files='wayland_scanner_rules'
ac_user_opts='
enable_option_checking
enable_silent_rules
enable_docs
enable_drm
enable_x11
enable_glx
enable_egl
enable_wayland
enable_dummy_driver
enable_dummy_backend
with_drivers_path
enable_static
enable_shared
......@@ -809,16 +822,20 @@ CXXCPP
PKG_CONFIG
PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR
DRM_CFLAGS
DRM_LIBS
X11_CFLAGS
X11_LIBS
XEXT_CFLAGS
XEXT_LIBS
XFIXES_CFLAGS
XFIXES_LIBS
DRM_CFLAGS
DRM_LIBS
UDEV_CFLAGS
UDEV_LIBS'
GLX_CFLAGS
GLX_LIBS
EGL_CFLAGS
EGL_LIBS
WAYLAND_CFLAGS
WAYLAND_LIBS'
# Initialize some variables set by options.
......@@ -1361,7 +1378,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures libva 1.0.16 to adapt to many kinds of systems.
\`configure' configures libva 1.1.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1431,7 +1448,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libva 1.0.16:";;
short | recursive ) echo "Configuration of libva 1.1.0:";;
esac
cat <<\_ACEOF
......@@ -1441,9 +1458,13 @@ Optional Features:
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-silent-rules less verbose build output (undo: `make V=1')
--disable-silent-rules verbose build output (undo: `make V=0')
--enable-glx build with OpenGL for X11 support
--enable-dummy-driver build dummy video driver
--enable-dummy-backend build dummy libva backend
--enable-docs build Doxygen documentation [default=no]
--enable-drm build with VA/DRM API support [default=yes]
--enable-x11 build with VA/X11 API support [default=yes]
--enable-glx build with VA/GLX API support [default=yes]
--enable-egl build with VA/EGL API support [default=yes]
--enable-wayland build with VA/Wayland API support [default=yes]
--enable-dummy-driver build dummy video driver [default=yes]
--enable-static[=PKGS] build static libraries [default=no]
--enable-shared[=PKGS] build shared libraries [default=yes]
--enable-fast-install[=PKGS]
......@@ -1481,6 +1502,8 @@ Some influential environment variables:
directories to add to pkg-config's search path
PKG_CONFIG_LIBDIR
path overriding pkg-config's built-in search path
DRM_CFLAGS C compiler flags for DRM, overriding pkg-config
DRM_LIBS linker flags for DRM, overriding pkg-config
X11_CFLAGS C compiler flags for X11, overriding pkg-config
X11_LIBS linker flags for X11, overriding pkg-config
XEXT_CFLAGS C compiler flags for XEXT, overriding pkg-config
......@@ -1488,10 +1511,14 @@ Some influential environment variables:
XFIXES_CFLAGS
C compiler flags for XFIXES, overriding pkg-config
XFIXES_LIBS linker flags for XFIXES, overriding pkg-config
DRM_CFLAGS C compiler flags for DRM, overriding pkg-config
DRM_LIBS linker flags for DRM, overriding pkg-config
UDEV_CFLAGS C compiler flags for UDEV, overriding pkg-config
UDEV_LIBS linker flags for UDEV, overriding pkg-config
GLX_CFLAGS C compiler flags for GLX, overriding pkg-config
GLX_LIBS linker flags for GLX, overriding pkg-config
EGL_CFLAGS C compiler flags for EGL, overriding pkg-config
EGL_LIBS linker flags for EGL, overriding pkg-config
WAYLAND_CFLAGS
C compiler flags for WAYLAND, overriding pkg-config
WAYLAND_LIBS
linker flags for WAYLAND, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
......@@ -1559,7 +1586,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
libva configure 1.0.16
libva configure 1.1.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
......@@ -2049,7 +2076,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by libva $as_me 1.0.16, which was
It was created by libva $as_me 1.1.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
......@@ -2398,6 +2425,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
am__api_version='1.11'
ac_aux_dir=
......@@ -2865,7 +2893,7 @@ fi
# Define the identity of the package.
PACKAGE='libva'
VERSION='1.0.16'
VERSION='1.1.0'
cat >>confdefs.h <<_ACEOF
......@@ -2948,37 +2976,80 @@ fi
AM_BACKSLASH='\'
TODAY="`LC_ALL=C date +'%a, %d %b %Y %X %z'`"
VA_API_MAJOR_VERSION=0
VA_API_MINOR_VERSION=32
VA_API_MICRO_VERSION=1
VA_API_VERSION=0.32.1
VA_API_MINOR_VERSION=33
VA_API_MICRO_VERSION=0
VA_API_VERSION=0.33.0
LIBVA_MAJOR_VERSION=1
LIBVA_MINOR_VERSION=0
LIBVA_MICRO_VERSION=16
LIBVA_VERSION=1.0.16
LIBVA_MINOR_VERSION=1
LIBVA_MICRO_VERSION=0
LIBVA_VERSION=1.1.0
LIBVA_LT_CURRENT=3202
LIBVA_LT_CURRENT=3301
LIBVA_LT_REV=0
LIBVA_LT_AGE=3201
LIBVA_LT_AGE=3300
LIBVA_LT_VERSION="$LIBVA_LT_CURRENT:$LIBVA_LT_REV:$LIBVA_LT_AGE"
LIBVA_LT_LDFLAGS="-version-info $LIBVA_LT_VERSION"
# Check whether --enable-docs was given.
if test "${enable_docs+set}" = set; then :
enableval=$enable_docs;
else
enable_docs="no"
fi
# Check whether --enable-drm was given.
if test "${enable_drm+set}" = set; then :
enableval=$enable_drm;
else
enable_drm="yes"
fi
# Check whether --enable-x11 was given.
if test "${enable_x11+set}" = set; then :
enableval=$enable_x11;
else
enable_x11="yes"
fi
# Check whether --enable-glx was given.
if test "${enable_glx+set}" = set; then :
enableval=$enable_glx;
else
enable_glx=yes
enable_glx="yes"
fi
# Check whether --enable-egl was given.
if test "${enable_egl+set}" = set; then :
enableval=$enable_egl;
else
enable_egl="yes"
fi
# Check whether --enable-wayland was given.
if test "${enable_wayland+set}" = set; then :
enableval=$enable_wayland;
else
enable_wayland="yes"
fi
......@@ -2986,7 +3057,7 @@ fi
if test "${enable_dummy_driver+set}" = set; then :
enableval=$enable_dummy_driver;
else
enable_dummy_driver=yes
enable_dummy_driver="yes"
fi
if test x$enable_dummy_driver = xyes; then
......@@ -2998,14 +3069,6 @@ else
fi
# Check whether --enable-dummy-backend was given.
if test "${enable_dummy_backend+set}" = set; then :
enableval=$enable_dummy_backend;
else
enable_dummy_backend=no
fi
# Check whether --with-drivers-path was given.
if test "${with_drivers_path+set}" = set; then :
......@@ -8039,6 +8102,10 @@ _lt_linker_boilerplate=`cat conftest.err`
$RM -r conftest*
## 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_prog_compiler_no_builtin_flag=
......@@ -15861,6 +15928,252 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "x$CC" != xcc; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
fi
set dummy $CC; ac_cc=`$as_echo "$2" |
sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
main ()
{
;
return 0;
}
_ACEOF
# Make sure it works both with $CC and with simple cc.
# We do the test twice because some compilers refuse to overwrite an
# existing .o file with -o, though they will create one.
ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
rm -f conftest2.*
if { { case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
$as_echo "$ac_try_echo"; } >&5
(eval "$ac_try") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } &&
test -f conftest2.$ac_objext && { { case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
$as_echo "$ac_try_echo"; } >&5
(eval "$ac_try") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; };
then
eval ac_cv_prog_cc_${ac_cc}_c_o=yes
if test "x$CC" != xcc; then
# Test first that cc exists at all.
if { ac_try='cc -c conftest.$ac_ext >&5'
{ { case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
$as_echo "$ac_try_echo"; } >&5
(eval "$ac_try") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; }; then
ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
rm -f conftest2.*
if { { case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
$as_echo "$ac_try_echo"; } >&5
(eval "$ac_try") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } &&
test -f conftest2.$ac_objext && { { case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
$as_echo "$ac_try_echo"; } >&5
(eval "$ac_try") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; };
then
# cc works too.
:
else
# cc exists but doesn't like -o.
eval ac_cv_prog_cc_${ac_cc}_c_o=no
fi
fi
fi
else
eval ac_cv_prog_cc_${ac_cc}_c_o=no
fi
rm -f core conftest*
fi
if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
fi
# FIXME: we rely on the cache variable name because
# there is no other way.
set dummy $CC
am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
if test "$am_t" != yes; then
# Losing compiler, so override with the script.
# FIXME: It is wrong to rewrite CC.
# But if we don't then we get into trouble of one sort or another.
# A longer-term fix would be to have automake use am__CC in this case,
# and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
CC="$am_aux_dir/compile $CC"
fi
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_PKG_CONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
[\\/]* | ?:[\\/]*)
ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
$as_echo "$PKG_CONFIG" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
fi
if test -z "$ac_cv_path_PKG_CONFIG"; then
ac_pt_PKG_CONFIG=$PKG_CONFIG
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
[\\/]* | ?:[\\/]*)
ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
;;
esac
fi