configure: don't have PKG_CHECK_MODULES not finding a package be a fatal error.

It may just mean we don't have it installed, in which case we might just
not want to configure the build to use it.

1 files changed, 134 insertions, 71 deletions

diff --git a/configure b/configure
index 9aa1bfdc..2b1a2051 100755
--- a/configure
+++ b/configure
@@ -7059,8 +7059,16 @@ fi
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnl-genl-3.0 with pkg-config" >&5
 $as_echo_n "checking for libnl-genl-3.0 with pkg-config... " >&6; }
+if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-genl-3.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libnl-genl-3.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
 
-if test -n "$LIBNL_CFLAGS"; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
+	if test -n "$LIBNL_CFLAGS"; then
     pkg_cv_LIBNL_CFLAGS="$LIBNL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
@@ -7077,7 +7085,7 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$LIBNL_LIBS"; then
+	if test -n "$LIBNL_LIBS"; then
     pkg_cv_LIBNL_LIBS="$LIBNL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
@@ -7097,8 +7105,8 @@ fi
 
 
 
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	if test $pkg_failed = yes; then
+	   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -7106,31 +7114,32 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 else
         _pkg_short_errors_supported=no
 fi
-        if test $_pkg_short_errors_supported = yes; then
-	        LIBNL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnl-genl-3.0" 2>&1`
-        else
-	        LIBNL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnl-genl-3.0" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBNL_PKG_ERRORS" >&5
+	        if test $_pkg_short_errors_supported = yes; then
+		        LIBNL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnl-genl-3.0" 2>&1`
+	        else
+		        LIBNL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnl-genl-3.0" 2>&1`
+	        fi
+		# Put the nasty error message in config.log where it belongs
+		echo "$LIBNL_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (libnl-genl-3.0) were not met:
+		as_fn_error $? "Package requirements (libnl-genl-3.0) were not met:
 
 $LIBNL_PKG_ERRORS
 
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
+
 Alternatively, you may set the environment variables LIBNL_CFLAGS
 and LIBNL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no (pkg-config not found)" >&5
+	elif test $pkg_failed = untried; then
+	     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no (pkg-config not found)" >&5
 $as_echo "no (pkg-config not found)" >&6; }
-else
-	LIBNL_CFLAGS=$pkg_cv_LIBNL_CFLAGS
-	LIBNL_LIBS=$pkg_cv_LIBNL_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+	else
+		LIBNL_CFLAGS=$pkg_cv_LIBNL_CFLAGS
+		LIBNL_LIBS=$pkg_cv_LIBNL_LIBS
+	        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 			pkg_config_found_libnl=yes
@@ -7140,8 +7149,15 @@ $as_echo "yes" >&6; }
 $as_echo "#define HAVE_LIBNL 1" >>confdefs.h
 
 
+	fi
+else
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+
 fi
 
+
 		if test x$pkg_config_found_libnl != xyes; then
 			#
 			# OK, either we don't have pkg-config or there
@@ -8426,8 +8442,16 @@ rm -f core conftest.err conftest.$ac_objext \
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl with pkg-config" >&5
 $as_echo_n "checking for openssl with pkg-config... " >&6; }
+if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "openssl") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
 
-if test -n "$OPENSSL_CFLAGS"; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
+	if test -n "$OPENSSL_CFLAGS"; then
     pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
@@ -8444,7 +8468,7 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$OPENSSL_LIBS"; then
+	if test -n "$OPENSSL_LIBS"; then
     pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
@@ -8464,8 +8488,8 @@ fi
 
 
 
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	if test $pkg_failed = yes; then
+	   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -8473,31 +8497,32 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 else
         _pkg_short_errors_supported=no
 fi
-        if test $_pkg_short_errors_supported = yes; then
-	        OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "openssl" 2>&1`
-        else
-	        OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "openssl" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$OPENSSL_PKG_ERRORS" >&5
+	        if test $_pkg_short_errors_supported = yes; then
+		        OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "openssl" 2>&1`
+	        else
+		        OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "openssl" 2>&1`
+	        fi
+		# Put the nasty error message in config.log where it belongs
+		echo "$OPENSSL_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (openssl) were not met:
+		as_fn_error $? "Package requirements (openssl) were not met:
 
 $OPENSSL_PKG_ERRORS
 
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
+
 Alternatively, you may set the environment variables OPENSSL_CFLAGS
 and OPENSSL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no (pkg-config not found)" >&5
+	elif test $pkg_failed = untried; then
+	     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no (pkg-config not found)" >&5
 $as_echo "no (pkg-config not found)" >&6; }
-else
-	OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
-	OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+	else
+		OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
+		OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
+	        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 			#
@@ -8505,7 +8530,14 @@ $as_echo "yes" >&6; }
 			#
 			HAVE_OPENSSL=yes
 
+	fi
+else
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+
 fi
+
 	fi
 
 	#
@@ -11739,8 +11771,16 @@ if test "$want_dpdk" != no; then
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libdpdk with pkg-config" >&5
 $as_echo_n "checking for libdpdk with pkg-config... " >&6; }
+if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdpdk\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libdpdk") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
 
-if test -n "$DPDK_CFLAGS"; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
+	if test -n "$DPDK_CFLAGS"; then
     pkg_cv_DPDK_CFLAGS="$DPDK_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
@@ -11757,7 +11797,7 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$DPDK_LIBS"; then
+	if test -n "$DPDK_LIBS"; then
     pkg_cv_DPDK_LIBS="$DPDK_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
@@ -11777,8 +11817,8 @@ fi
 
 
 
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	if test $pkg_failed = yes; then
+	   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -11786,37 +11826,45 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 else
         _pkg_short_errors_supported=no
 fi
-        if test $_pkg_short_errors_supported = yes; then
-	        DPDK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdpdk" 2>&1`
-        else
-	        DPDK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdpdk" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$DPDK_PKG_ERRORS" >&5
+	        if test $_pkg_short_errors_supported = yes; then
+		        DPDK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdpdk" 2>&1`
+	        else
+		        DPDK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdpdk" 2>&1`
+	        fi
+		# Put the nasty error message in config.log where it belongs
+		echo "$DPDK_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (libdpdk) were not met:
+		as_fn_error $? "Package requirements (libdpdk) were not met:
 
 $DPDK_PKG_ERRORS
 
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
+
 Alternatively, you may set the environment variables DPDK_CFLAGS
 and DPDK_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no (pkg-config not found)" >&5
+	elif test $pkg_failed = untried; then
+	     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no (pkg-config not found)" >&5
 $as_echo "no (pkg-config not found)" >&6; }
-else
-	DPDK_CFLAGS=$pkg_cv_DPDK_CFLAGS
-	DPDK_LIBS=$pkg_cv_DPDK_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+	else
+		DPDK_CFLAGS=$pkg_cv_DPDK_CFLAGS
+		DPDK_LIBS=$pkg_cv_DPDK_LIBS
+	        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 		found_dpdk_with_pkg_config=yes
 
+	fi
+else
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+
 fi
 
+
 	#
 	# If we didn't find it with pkg-config, try checking for
 	# it manually.
@@ -12215,8 +12263,16 @@ if test "x$enable_dbus" != "xno"; then
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus-1 with pkg-config" >&5
 $as_echo_n "checking for dbus-1 with pkg-config... " >&6; }
+if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
 
-if test -n "$DBUS_CFLAGS"; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
+	if test -n "$DBUS_CFLAGS"; then
     pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
@@ -12233,7 +12289,7 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$DBUS_LIBS"; then
+	if test -n "$DBUS_LIBS"; then
     pkg_cv_DBUS_LIBS="$DBUS_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
@@ -12253,8 +12309,8 @@ fi
 
 
 
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	if test $pkg_failed = yes; then
+	   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -12262,26 +12318,26 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 else
         _pkg_short_errors_supported=no
 fi
-        if test $_pkg_short_errors_supported = yes; then
-	        DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1" 2>&1`
-        else
-	        DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-1" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$DBUS_PKG_ERRORS" >&5
+	        if test $_pkg_short_errors_supported = yes; then
+		        DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1" 2>&1`
+	        else
+		        DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-1" 2>&1`
+	        fi
+		# Put the nasty error message in config.log where it belongs
+		echo "$DBUS_PKG_ERRORS" >&5
 
 
 		if test "x$enable_dbus" = "xyes"; then
 			as_fn_error $? "--enable-dbus was given, but the dbus-1 package is not installed" "$LINENO" 5
 		fi
 
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no (pkg-config not found)" >&5
+	elif test $pkg_failed = untried; then
+	     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no (pkg-config not found)" >&5
 $as_echo "no (pkg-config not found)" >&6; }
-else
-	DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
-	DBUS_LIBS=$pkg_cv_DBUS_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+	else
+		DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
+		DBUS_LIBS=$pkg_cv_DBUS_LIBS
+	        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 		save_CFLAGS="$CFLAGS"
@@ -12330,8 +12386,15 @@ rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 		CFLAGS="$save_CFLAGS"
 
+	fi
+else
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+
 fi
 
+
 fi
 
 # Check whether --enable-rdma was given.