[master] e479ee0da fix libedit autoconf when configured via pkg-config
Nils Goroll
nils.goroll at uplex.de
Thu Dec 3 16:03:08 UTC 2020
commit e479ee0da0b77bc9a51d15fd60e1d6945f1a9f83
Author: Nils Goroll <nils.goroll at uplex.de>
Date: Thu Dec 3 16:21:21 2020 +0100
fix libedit autoconf when configured via pkg-config
diff --git a/configure.ac b/configure.ac
index b63840512..3f7d43744 100644
--- a/configure.ac
+++ b/configure.ac
@@ -179,10 +179,17 @@ AC_CHECK_HEADERS([edit/readline/readline.h],
LIBEDIT_LIBS="-ledit"],
[PKG_CHECK_MODULES([LIBEDIT], [libedit],
+ [
# having the module does not imply having the header
- [AC_CHECK_HEADERS([editline/readline.h],
+ AC_SUBST(LIBEDIT_CFLAGS)
+ AC_SUBST(LIBEDIT_LIBS)
+ save_CFLAGS="${CFLAGS}"
+ CFLAGS="${CFLAGS} ${LIBEDIT_CFLAGS}"
+ AC_CHECK_HEADERS([editline/readline.h],
[AC_DEFINE([HAVE_LIBEDIT], [1], [Define if we have libedit])],
- [AC_MSG_ERROR([Found libedit, but header file is missing. Hint: Install dev package?])])],
+ [AC_MSG_ERROR([Found libedit, but header file is missing. Hint: Install dev package?])])
+ CFLAGS="${save_CFLAGS}"
+ ],
[
# AX_LIB_READLINE overwrites LIBS which leads to every binary getting
# linked against libreadline uselessly. So we re-use LIBEDIT_LIBS which
More information about the varnish-commit
mailing list