$OpenBSD: patch-configure_ac,v 1.19 2020/03/08 08:17:57 robert Exp $

Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -110,11 +110,13 @@ AS_CASE([$host_os],
 		BUILDOS="openbsd"
 		ZCPPFLAGS="$ZCPPFLAGS -DOPENBSD"
 		LN_TFSV="ln -fs"
+		TINFO_LIB=""
 	],
 	[linux*], [
 		BUILDOS="linux"
 		ZCPPFLAGS="$ZCPPFLAGS -DLINUX"
 		LN_TFSV="ln -Tfsv"
+		TINFO_LIB="-ltinfo"
 	],
 	[*], [
 		LN_TFSV="ln -fs"
@@ -263,7 +265,7 @@ AC_DEFUN([LIBNCURSES_WITH_CONFIG],[
 		[
 			dnl just pick the lowest common denominator
 			NCURSES_FLAGS=""
-			NCURSES_LIBS="-lncurses -ltinfo"
+			NCURSES_LIBS="-lncurses ${TINFO_LIB}"
 		]
 	)
 	AC_CHECK_HEADERS([ncurses.h])
@@ -304,7 +306,7 @@ PKG_CHECK_MODULES([idn], [libidn2], [AC_DEFINE([HAVE_I
 PKG_CHECK_MODULES([xapian], [xapian-core])
 PKG_CHECK_MODULES([XML2], [libxml-2.0])
 
-dbcxx_CPPFLAGS=""
+dbcxx_CPPFLAGS="-I/usr/local/include/db4"
 dbcxx_LIBS="-ldb_cxx"
 CPPFLAGS="$CPPFLAGS_system $dbcxx_CPPFLAGS"
 AC_CHECK_HEADERS([db_cxx.h], [], [AC_MSG_ERROR([Berkeley DB C++ interface required])])
@@ -437,7 +439,7 @@ LDAP_FLAGS=""
 LDAP_LIBS=""
 AC_CHECK_HEADERS([ldap.h], [
 	LDAP_FLAGS="-DLDAP_DEPRECATED=1"
-	LDAP_LIBS="-lldap_r"
+	LDAP_LIBS="-L/usr/local/lib -lldap_r"
 	want_ldap=yes
 ])
 AC_SUBST(LDAP_LIBS)
@@ -462,7 +464,7 @@ iconv_t i; i = iconv_open("", "");
 	[ AC_MSG_RESULT([yes]) ],
 	[ AC_MSG_RESULT([no])
 	  AC_MSG_CHECKING([for iconv in -liconv])
-	  LIBS="$LIBS -liconv"
+	  LIBS="$LIBS -L/usr/local/lib -liconv"
 	  AC_LINK_IFELSE([ AC_LANG_SOURCE([
 #include <stdlib.h>
 #include <iconv.h>
@@ -481,7 +483,7 @@ AC_SEARCH_LIBS([crypt_r], [crypt], [
 ])
 LIBS="$LIBS_system"
 AC_SEARCH_LIBS([clock_gettime], [rt], [
-	AS_IF([test "$LIBS" = "$LIBS_system"], [clock_LIBS=""], [clock_LIBS="-lrt"])
+	AS_IF([test "$LIBS" = "$LIBS_system"], [clock_LIBS=""], [clock_LIBS=""])
 ])
 LIBS="$LIBS_system"
 AC_SUBST([CRYPT_LIBS])
@@ -594,12 +596,14 @@ AC_CHECK_LIB([z], [gzopen], GZ_LIBS="-lz",
 )
 AC_SUBST(GZ_LIBS)
 
-AC_CHECK_FUNCS([gettext], INTL_LIBS="", dnl gettext in libc
-  AC_CHECK_LIB([intl], [gettext], INTL_LIBS="-lintl", dnl in -lintl
+LIBS="$LIBS -L/usr/local/lib"
+AC_CHECK_FUNCS([gettext], INTL_LIBS="-L/usr/local/lib -lintl", dnl gettext in libc
+  AC_CHECK_LIB([intl], [gettext], INTL_LIBS="-L/usr/local/lib -lintl", dnl in -lintl
     AC_MSG_ERROR([required library libintl missing or unusable])
   )
 )
 AC_SUBST(INTL_LIBS)
+LIBS=$LIBS_system
 
 # check epoll support
 AC_ARG_ENABLE([epoll], AS_HELP_STRING([--disable-epoll], [disable epoll and fallback to select]), [want_epoll=${enableval}], [want_epoll=yes])
