mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-14 15:50:07 +02:00
64 lines
2.3 KiB
Plaintext
64 lines
2.3 KiB
Plaintext
From 0b6126dda25d21a7e9150ea850c932da63debffd Mon Sep 17 00:00:00 2001
|
|
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
|
|
Date: Mon, 13 Apr 2020 12:10:27 -0400
|
|
Subject: Avoid git fanciness during build.
|
|
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 7b7ae75..b21162e 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -9,7 +9,7 @@ dnl Boilerplace and versioning
|
|
dnl ###########################################################################
|
|
|
|
# if autoconf is used not in a git source tree, use version=2.6.4
|
|
-AC_INIT([balsa],[m4_esyscmd(test -d .git && echo -n `git describe --tags` || echo -n 2.6.4)],[])
|
|
+AC_INIT([balsa],[2.6.4],[])
|
|
|
|
AM_INIT_AUTOMAKE
|
|
AC_LANG([C])
|
|
@@ -563,7 +563,7 @@ fi
|
|
# extra warnings for GIT.
|
|
#
|
|
|
|
-if test -d "${srcdir}/.git" ; then
|
|
+if false ; then
|
|
BALSA_FROM_GIT=yes
|
|
BALSA_CFLAGS="$BALSA_CFLAGS -Wall -Werror"
|
|
BALSA_DEFS="$BALSA_DEFS \
|
|
--
|
|
2.37.3
|
|
|
|
|
|
From 53eafeb193363483f4529653c1e6158380ac3f8e Mon Sep 17 00:00:00 2001
|
|
From: Begasus <begasus@gmail.com>
|
|
Date: Sun, 20 Aug 2023 19:33:40 +0200
|
|
Subject: Fix building with webkit2gtk and libldap
|
|
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index b21162e..cc777dc 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -263,7 +263,7 @@ case "$use_html_widget" in
|
|
webkit2)
|
|
AC_MSG_RESULT([$use_html_widget])
|
|
# note: sqlite3 is needed to manage html vs. plain and image download preferences
|
|
- PKG_CHECK_MODULES(HTML, [ webkit2gtk-4.0 >= 2.28.0
|
|
+ PKG_CHECK_MODULES(HTML, [ webkit2gtk-4.1 >= 2.28.0
|
|
sqlite3 >= 3.24.0])
|
|
BALSA_WEB_EXTENSIONS="${libdir}/${PACKAGE}"
|
|
AC_SUBST(BALSA_WEB_EXTENSIONS)
|
|
@@ -342,7 +342,7 @@ if test x"$with_ldap" != xno ; then
|
|
AC_MSG_RESULT([yes])
|
|
AC_CHECK_LIB(ldap, ldap_search, AC_DEFINE(ENABLE_LDAP, 1,
|
|
[Defined when the LDAP support is to be compiled in.])
|
|
- LIBS="-lldap -llber -lresolv $LIBS", AC_MSG_ERROR([*** You enabled LDAP but ldap library is not found.]), -llber -lresolv)
|
|
+ LIBS="-lldap -llber -lnetwork $LIBS", AC_MSG_ERROR([*** You enabled LDAP but ldap library is not found.]), -llber -lnetwork)
|
|
AC_CHECK_LIB(ldap, ldap_start_tls_s,
|
|
AC_DEFINE(HAVE_LDAP_TLS,1,
|
|
[Defined when LDAP lib supports TLS]))
|
|
--
|
|
2.37.3
|
|
|