Commit 198563e4 authored by Thomas Markwalder's avatar Thomas Markwalder

[master] Updated auto-generated files after merging rt40371

parent 59e2c16f
......@@ -323,6 +323,7 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
pkgcfg_found = @pkgcfg_found@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
......
......@@ -288,6 +288,7 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
pkgcfg_found = @pkgcfg_found@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
......
......@@ -337,6 +337,7 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
pkgcfg_found = @pkgcfg_found@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
......
......@@ -313,6 +313,7 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
pkgcfg_found = @pkgcfg_found@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
......
......@@ -631,6 +631,7 @@ HAVE_ATF_TRUE
ATF_BIN
ATF_LDFLAGS
ATF_CFLAGS
pkgcfg_found
byte_order
RANLIB
EGREP
......@@ -5452,6 +5453,46 @@ if test "$atf_path" != "no" ; then
if test "$atf_pcp" = "" ; then
as_fn_error $? "Unable to find atf files in location specified" "$LINENO" 5
else
# 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_prog_pkgcfg_found+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$pkgcfg_found"; then
ac_cv_prog_pkgcfg_found="$pkgcfg_found" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_pkgcfg_found="pkg-config"
$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
fi
fi
pkgcfg_found=$ac_cv_prog_pkgcfg_found
if test -n "$pkgcfg_found"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pkgcfg_found" >&5
$as_echo "$pkgcfg_found" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
if test "$pkgcfg_found" = ""; then
as_fn_error $? "Could not locate ATF, pkg-config not installed" "$LINENO" 5
fi
ATF_CFLAGS="`PKG_CONFIG_PATH=$atf_pcp pkg-config --cflags atf-c` -DUNIT_TEST"
ATF_LDFLAGS="`PKG_CONFIG_PATH=$atf_pcp pkg-config --libs atf-c`"
if test -f $atf_pcp/atf-sh.pc ; then
......
......@@ -303,6 +303,7 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
pkgcfg_found = @pkgcfg_found@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
......
......@@ -286,6 +286,7 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
pkgcfg_found = @pkgcfg_found@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
......
......@@ -260,6 +260,7 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
pkgcfg_found = @pkgcfg_found@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
......
......@@ -261,6 +261,7 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
pkgcfg_found = @pkgcfg_found@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
......
......@@ -300,6 +300,7 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
pkgcfg_found = @pkgcfg_found@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
......
......@@ -282,6 +282,7 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
pkgcfg_found = @pkgcfg_found@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
......
......@@ -334,6 +334,7 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
pkgcfg_found = @pkgcfg_found@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
......
......@@ -346,6 +346,7 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
pkgcfg_found = @pkgcfg_found@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
......
......@@ -255,6 +255,7 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
pkgcfg_found = @pkgcfg_found@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment