aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--aclocal.m425
-rwxr-xr-xconfigure120
2 files changed, 108 insertions, 37 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index 1a1d50d7..ceeccd4a 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1161,7 +1161,10 @@ pkg_failed=no
AC_MSG_CHECKING([for $2 with pkg-config])
PKG_CHECK_EXISTS($2,
[
- AC_MSG_RESULT(found)
+ #
+ # The package was found, so try to get its C flags and
+ # libraries.
+ #
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
@@ -1171,7 +1174,10 @@ and $1[]_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.])
if test $pkg_failed = yes; then
- AC_MSG_RESULT([no])
+ #
+ # That failed - report an error.
+ #
+ AC_MSG_RESULT([error])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
@@ -1192,16 +1198,25 @@ installed software in a non-standard prefix.
_PKG_TEXT])[]dnl
])
elif test $pkg_failed = untried; then
- AC_MSG_RESULT([no (pkg-config not found)])
+ #
+ # We don't have pkg-config, so it didn't work.
+ #
+ AC_MSG_RESULT([not found (pkg-config not found)])
else
+ #
+ # We found the package.
+ #
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
- AC_MSG_RESULT([yes])
+ AC_MSG_RESULT([found])
$3
fi[]dnl
],
[
- AC_MSG_RESULT(not found)
+ #
+ # The package isn't present.
+ #
+ AC_MSG_RESULT([not found])
])
])dnl PKG_CHECK_MODULES
diff --git a/configure b/configure
index 2b1a2051..eac7d3ba 100755
--- a/configure
+++ b/configure
@@ -7066,8 +7066,10 @@ if test -n "$PKG_CONFIG" && \
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }
+ #
+ # The package was found, so try to get its C flags and
+ # libraries.
+ #
if test -n "$LIBNL_CFLAGS"; then
pkg_cv_LIBNL_CFLAGS="$LIBNL_CFLAGS"
elif test -n "$PKG_CONFIG"; then
@@ -7106,8 +7108,11 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ #
+ # That failed - report an error.
+ #
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: error" >&5
+$as_echo "error" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -7134,13 +7139,19 @@ 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
-$as_echo "no (pkg-config not found)" >&6; }
+ #
+ # We don't have pkg-config, so it didn't work.
+ #
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found (pkg-config not found)" >&5
+$as_echo "not found (pkg-config not found)" >&6; }
else
+ #
+ # We found the package.
+ #
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; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
pkg_config_found_libnl=yes
V_INCLS="$V_INCLS $LIBNL_CFLAGS"
@@ -7152,6 +7163,9 @@ $as_echo "#define HAVE_LIBNL 1" >>confdefs.h
fi
else
+ #
+ # The package isn't present.
+ #
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
$as_echo "not found" >&6; }
@@ -8449,8 +8463,10 @@ if test -n "$PKG_CONFIG" && \
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }
+ #
+ # The package was found, so try to get its C flags and
+ # libraries.
+ #
if test -n "$OPENSSL_CFLAGS"; then
pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
elif test -n "$PKG_CONFIG"; then
@@ -8489,8 +8505,11 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ #
+ # That failed - report an error.
+ #
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: error" >&5
+$as_echo "error" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -8517,13 +8536,19 @@ 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
-$as_echo "no (pkg-config not found)" >&6; }
+ #
+ # We don't have pkg-config, so it didn't work.
+ #
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found (pkg-config not found)" >&5
+$as_echo "not found (pkg-config not found)" >&6; }
else
+ #
+ # We found the package.
+ #
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; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
#
# We found OpenSSL/libressl.
@@ -8533,6 +8558,9 @@ $as_echo "yes" >&6; }
fi
else
+ #
+ # The package isn't present.
+ #
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
$as_echo "not found" >&6; }
@@ -11778,8 +11806,10 @@ if test -n "$PKG_CONFIG" && \
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }
+ #
+ # The package was found, so try to get its C flags and
+ # libraries.
+ #
if test -n "$DPDK_CFLAGS"; then
pkg_cv_DPDK_CFLAGS="$DPDK_CFLAGS"
elif test -n "$PKG_CONFIG"; then
@@ -11818,8 +11848,11 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ #
+ # That failed - report an error.
+ #
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: error" >&5
+$as_echo "error" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -11846,19 +11879,28 @@ 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
-$as_echo "no (pkg-config not found)" >&6; }
+ #
+ # We don't have pkg-config, so it didn't work.
+ #
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found (pkg-config not found)" >&5
+$as_echo "not found (pkg-config not found)" >&6; }
else
+ #
+ # We found the package.
+ #
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; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
found_dpdk_with_pkg_config=yes
fi
else
+ #
+ # The package isn't present.
+ #
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
$as_echo "not found" >&6; }
@@ -12270,8 +12312,10 @@ if test -n "$PKG_CONFIG" && \
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }
+ #
+ # The package was found, so try to get its C flags and
+ # libraries.
+ #
if test -n "$DBUS_CFLAGS"; then
pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
elif test -n "$PKG_CONFIG"; then
@@ -12310,8 +12354,11 @@ fi
if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ #
+ # That failed - report an error.
+ #
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: error" >&5
+$as_echo "error" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -12332,13 +12379,19 @@ fi
fi
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; }
+ #
+ # We don't have pkg-config, so it didn't work.
+ #
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found (pkg-config not found)" >&5
+$as_echo "not found (pkg-config not found)" >&6; }
else
+ #
+ # We found the package.
+ #
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; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
save_CFLAGS="$CFLAGS"
save_LIBS="$LIBS"
@@ -12389,6 +12442,9 @@ rm -f core conftest.err conftest.$ac_objext \
fi
else
+ #
+ # The package isn't present.
+ #
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
$as_echo "not found" >&6; }