[master] Updated auto-generated files after merging rt40371

diff --git a/Makefile.in b/Makefile.in
index e3c51854e99fbdb841dcee8963d245553ce986e0..342fa25d2672e8bc329f104bcb59a9e88d72b1a3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -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@

diff --git a/client/Makefile.in b/client/Makefile.in
index f3218fdb7e05dc9123dbc0bccc031b1e6a21742b..7bd1ca953cad44ae21b9bdc339eb5a8ec9bacdc7 100644 (file)
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -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@

diff --git a/common/Makefile.in b/common/Makefile.in
index e16f53fbb95fd09048056a78d68eb8028e676539..c21ca0e7b86035f7dd36a69c6481bd109d7c070e 100644 (file)
--- a/common/Makefile.in
+++ b/common/Makefile.in
@@ -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@

diff --git a/common/tests/Makefile.in b/common/tests/Makefile.in
index 4472fb851882fc736aa4fe9f951dd426231edd0f..5ccf3b7e85cd3404af4822390193d07035000e08 100644 (file)
--- a/common/tests/Makefile.in
+++ b/common/tests/Makefile.in
@@ -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@

diff --git a/configure b/configure
index 0b23b59f6b22058112573264b83e55e620663294..3e435187b26c1e7e0909394f969cf59d0fb8f921 100755 (executable)
--- a/configure
+++ b/configure
@@ -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

diff --git a/dhcpctl/Makefile.in b/dhcpctl/Makefile.in
index 7892a7b307b1ceaa9205302034015919b10eefbb..d86edc4d0356fae96c38da8da207ccc53ff66739 100644 (file)
--- a/dhcpctl/Makefile.in
+++ b/dhcpctl/Makefile.in
@@ -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@

diff --git a/dst/Makefile.in b/dst/Makefile.in
index 20108dc693d82009926fedfb0e4584ef44f6ebbb..5228412041dc61943ac1ac5600901f2424859a0d 100644 (file)
--- a/dst/Makefile.in
+++ b/dst/Makefile.in
@@ -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@

diff --git a/includes/Makefile.in b/includes/Makefile.in
index e7ad7a0df0cd5f4463211b91381ebd6064892731..b4d5b971ea6469206af92aaec50c59864c4b6be2 100644 (file)
--- a/includes/Makefile.in
+++ b/includes/Makefile.in
@@ -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@

diff --git a/minires/Makefile.in b/minires/Makefile.in
index 4a7a8c760068f14c012dc36e0feee72b3febcd81..7547a6920cef8dda65f09fb1200d6130a00b95c5 100644 (file)
--- a/minires/Makefile.in
+++ b/minires/Makefile.in
@@ -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@

diff --git a/omapip/Makefile.in b/omapip/Makefile.in
index 773ef8cd7f0c95a9d01089e26d21f599ad5994e4..35548460376eb5a2e0438640f8109d7ba37d1522 100644 (file)
--- a/omapip/Makefile.in
+++ b/omapip/Makefile.in
@@ -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@

diff --git a/relay/Makefile.in b/relay/Makefile.in
index 9103030fdffcb71f5baaac912e55d47a13f38939..aef3666723055990baced6e216054d5093f81291 100644 (file)
--- a/relay/Makefile.in
+++ b/relay/Makefile.in
@@ -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@

diff --git a/server/Makefile.in b/server/Makefile.in
index 26f81e79e11e8885d0f0662a802116e8a4161381..a3cba4314f5e168ca26e3bc5eeffd5e5b5b6f284 100644 (file)
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -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@

diff --git a/server/tests/Makefile.in b/server/tests/Makefile.in
index cc008ddbd71625c0ce35e1d8d20089217987d076..539b273e461608e5d700b35cf20739ab618b2103 100644 (file)
--- a/server/tests/Makefile.in
+++ b/server/tests/Makefile.in
@@ -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@

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 336dd7e185dcb827579361d4950baf73fd0e615e..19a5f13b73c3836ed0118ded8d7c82c4f82ac1da 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -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@