| Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame^] | 1 | From 63dbf8a9f04b34474021e8f0bf239b7446f10a7f Mon Sep 17 00:00:00 2001 |
| 2 | From: Jiaqing Zhao <jiaqing.zhao@linux.intel.com> |
| 3 | Date: Thu, 3 Mar 2022 09:01:23 +0000 |
| 4 | Subject: [PATCH] Fix libESMTP dependency check |
| 5 | |
| 6 | Since libesmtp-1.1.0, libesmtp-config is removed, use pkg-config to |
| 7 | check for existence instead. |
| 8 | |
| 9 | Signed-off-by: Jiaqing Zhao <jiaqing.zhao@linux.intel.com> |
| 10 | --- |
| 11 | configure.ac | 8 +++++--- |
| 12 | 1 file changed, 5 insertions(+), 3 deletions(-) |
| 13 | |
| 14 | diff --git a/configure.ac b/configure.ac |
| 15 | index 64b19b4..83346a8 100644 |
| 16 | --- a/configure.ac |
| 17 | +++ b/configure.ac |
| 18 | @@ -11,6 +11,8 @@ AC_PROG_CC |
| 19 | |
| 20 | AC_HEADER_STDC |
| 21 | |
| 22 | +PKG_PROG_PKG_CONFIG |
| 23 | + |
| 24 | dnl getopt needs this |
| 25 | AC_C_CONST |
| 26 | |
| 27 | @@ -30,11 +32,11 @@ then |
| 28 | AC_CHECK_HEADER(libesmtp.h, ,[AC_MSG_ERROR([libesmtp.h not found in $with_libesmtp])]) |
| 29 | fi |
| 30 | AC_MSG_CHECKING(for libESMTP) |
| 31 | -if libesmtp-config --version > /dev/null 2>&1 |
| 32 | +if $PKG_CONFIG --exists 'libesmtp-1.0' |
| 33 | then |
| 34 | AC_MSG_RESULT(yes) |
| 35 | - CFLAGS="$CFLAGS `libesmtp-config --cflags`" |
| 36 | - LIBS="$LIBS `libesmtp-config --libs`" |
| 37 | + CFLAGS="$CFLAGS `$PKG_CONFIG --cflags 'libesmtp-1.0'`" |
| 38 | + LIBS="$LIBS `$PKG_CONFIG --libs 'libesmtp-1.0'`" |
| 39 | else |
| 40 | AC_MSG_RESULT(no) |
| 41 | AC_MSG_ERROR(libESMTP library not found) |
| 42 | -- |
| 43 | 2.32.0 |
| 44 | |