Skip to content

Commit

Permalink
Merge pull request #15888 from tru7/linknx
Browse files Browse the repository at this point in the history
linknx: adopt new libesmtp version
  • Loading branch information
neheb authored Jun 16, 2021
2 parents a23825d + 035d3d5 commit 03beef3
Showing 1 changed file with 36 additions and 0 deletions.
36 changes: 36 additions & 0 deletions net/linknx/patches/020-configure.ac.patch
Original file line number Diff line number Diff line change
@@ -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])


0 comments on commit 03beef3

Please sign in to comment.