$OpenBSD: patch-configure_ac,v 1.21 2021/04/02 06:43:01 robert Exp $

Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -91,7 +91,7 @@ AM_PROG_CC_C_O
 AC_PROG_CXX
 AC_PROG_INSTALL
 dnl Needed, at the very least, for `make dist` (hence outside enable_base)
-AX_PKG_SWIG_MAX(3, [], [ AC_MSG_ERROR([SWIG 3 is required to build..]) ])
+AC_PATH_PROG([SWIG_EXEC], [swig])
 
 # configure may rerun as part of git-checking out a different version,
 # so remove stale version
@@ -107,11 +107,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"
@@ -261,7 +263,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])
@@ -427,7 +429,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)
@@ -452,7 +454,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>
@@ -471,7 +473,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])
@@ -589,9 +591,9 @@ AC_LINK_IFELSE([LIBINTLTEST], [
 ], [
 	AC_MSG_RESULT([no])
 	AC_MSG_CHECKING([dcgettext in -lintl])
-	LIBS="-lintl"
+	LIBS="-L/usr/local/lib -lintl"
 	AC_LINK_IFELSE([LIBINTLTEST], [
-		INTL_LIBS="-lintl"
+		INTL_LIBS="-L/usr/local/lib -lintl"
 		AC_MSG_RESULT([yes])
 	], [
 		AC_MSG_RESULT([no])
