[Commits] [SCM] claws branch, master, updated. 4.1.1-21-gefd66a931

jonathan at claws-mail.org jonathan at claws-mail.org
Mon Nov 28 05:45:08 CET 2022


The branch, master has been updated
       via  efd66a9312197b05e4255e09c9f1957d7f9feeca (commit)
      from  51d6662d2e76f241b229679b54a9150838424bdc (commit)

Summary of changes:
 configure.ac | 5 +++++
 1 file changed, 5 insertions(+)


- Log -----------------------------------------------------------------
commit efd66a9312197b05e4255e09c9f1957d7f9feeca
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Sun Nov 27 18:47:38 2022 -0700

    Use libetpan CFLAGS for header check

diff --git a/configure.ac b/configure.ac
index 317d6fa0d..0e60ece2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -976,13 +976,18 @@ if test x"$enable_libetpan" = xyes; then
         fi
     ])
     if test "x$libetpan_config" = "xyes"; then
+        libetpan_save_CPPFLAGS=$CPPFLAGS
+        CPPFLAGS="$CPPFLAGS $LIBETPAN_CFLAGS"
         AC_CHECK_HEADER(libetpan/libetpan.h, [libetpan_result=yes])
         if test "x$libetpan_result" = "xyes"; then
             AC_MSG_CHECKING([whether libetpan-config hints compiles and links fine])
+            libetpan_save_LIBS=$LIBS
             LIBS="$LIBS $LIBETPAN_LIBS"
             AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <libetpan/dbstorage.h>]], [[db_mailstorage_init(NULL, NULL);]])],[libetpan_result=yes],[libetpan_result=no])
+            LIBS=$libetpan_save_LIBS
             AC_MSG_RESULT([$libetpan_result])
         fi
+        CPPFLAGS=$libetpan_save_CPPFLAGS
     fi
     if test "x$libetpan_result" = "xyes"; then
         if test $libetpan_versiontype -eq 1; then

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list