Marcus Meissner
3ed39aac9e
- Update to version 1.5.4 * Support packet drop reason reporting when included in netlink message * fix some minor compilation warnings/errors * clean up some comments about deadline support * convert configure.ac to use AM_PROG_LIBTOOL from outdated LT_INIT * Fix missing SOL_NETLINK define in glibc < 2.24 * Fix licensing issues that didn't make sense * ignore ENOBUFS errors on data socket * adding arm64 travis ci testing * man page updates * move to libnl3 from libnl - add old-readline.diff to revert (when building for <= 15.x) an upstream change that requires libreadline >= 8.0 OBS-URL: https://build.opensuse.org/request/show/970601 OBS-URL: https://build.opensuse.org/package/show/network:utilities/dropwatch?expand=0&rev=6
30 lines
1.3 KiB
Diff
30 lines
1.3 KiB
Diff
This patch REVERTS the commit below
|
|
|
|
commit c18f3d25a94eb72145c663797794d2697a226594
|
|
Author: Neil Horman <nhorman@gmail.com>
|
|
Date: Mon Mar 15 08:26:30 2021 -0400
|
|
|
|
Update configure to fail if readline isn't installed
|
|
|
|
We had libreadline pkg check in configure hacked a bit. Because
|
|
libreadline didn't have a .pc file for years, we fell back on just
|
|
adding the library as a linker option and letting the compile fail when
|
|
readline.h couldn't be found. Now that readline 8.0 has been out for 2
|
|
years (which included the .pc file), I think we can safely test for it,
|
|
and fail if its not found
|
|
|
|
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 278da54..2a840cc 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -16,6 +16,6 @@ AC_CHECK_FUNCS(getopt_long)
|
|
PKG_CHECK_MODULES([LIBNL3], [libnl-3.0], [], [AC_MSG_ERROR([libnl-3.0 is required])])
|
|
PKG_CHECK_MODULES([LIBNLG3], [libnl-genl-3.0], [], [AC_MSG_ERROR([libnl-genl-3.0 is required])])
|
|
+PKG_CHECK_MODULES([READLINE], [readline], [], [READLINE_LIBS=-lreadline])
|
|
-PKG_CHECK_MODULES([READLINE], [readline], [], [AC_MSG_ERROR([libreadline is required])])
|
|
PKG_CHECK_MODULES([LIBPCAP], [libpcap], [], [
|
|
AC_CHECK_LIB(pcap, pcap_open_live,[],
|
|
[AC_MSG_ERROR([libpcap is required])])])
|