Browse Source

Merge pull request #15888 from tru7/linknx

linknx: adopt new libesmtp version
lilik-openwrt-22.03
Rosen Penev 3 years ago
committed by GitHub
parent
commit
03beef3f4e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 0 deletions
  1. +36
    -0
      net/linknx/patches/020-configure.ac.patch

+ 36
- 0
net/linknx/patches/020-configure.ac.patch View File

@ -0,0 +1,36 @@
--- a/configure.ac
+++ b/configure.ac
@@ -90,8 +90,24 @@ if test x"$enable_smtp" != xno ; then
)
fi
-AC_MSG_CHECKING(whether to use libesmtp)
+AC_MSG_CHECKING(whether to use libesmtp >= v1.1.x)
if test x"$enable_smtp" != xno ; then
+ PKG_CHECK_MODULES(ESMTP, libesmtp-1.0 >= 1.1.0, [
+ AC_DEFINE([HAVE_LIBESMTP], [1], [Build with libesmtp email support.])
+ AC_SUBST(ESMTP_CFLAGS)
+ AC_SUBST(ESMTP_LIBS)
+ if test x"`echo $ESMTP_LIBS | grep pthread`" != x ; then
+ AC_MSG_WARN([libesmtp is compiled with pthread support. This can conflict with pth. If you observe segmentation faults at startup, try to recompile with libesmtp support disabled])
+ AC_DEFINE([HAVE_LIBESMTP_PTHREAD], [1], [libesmtp is compiled with pthread support.])
+ fi
+ found_esmtp=yes
+ ],[
+ AC_MSG_RESULT([no])
+ ])
+fi
+if test x"$found_esmtp" = x ; then
+AC_MSG_CHECKING(whether to use libesmtp v1.0.x)
+if test x"$enable_smtp" != xno && test x`which libesmtp-config` != x ; then
ESMTP_CFLAGS="`libesmtp-config --cflags`"
ESMTP_LIBS="`libesmtp-config --libs`"
if test x"`libesmtp-config --libs | grep pthread`" != x ; then
@@ -110,6 +126,7 @@ if test x"$enable_smtp" != xno ; then
else
AC_MSG_RESULT([no])
fi
+fi
AM_CONDITIONAL([USE_B64], [test x"$enable_smtp" != xno])

Loading…
Cancel
Save