Commit Diff

Commit:
f6fb796a41af1721a0e62904bb413fd6ca8d4f33
From:
Thomas Adam <thomas.adam22@gmail.com>
Date:
Message:
portability: fixes for FreeBSD Add a PKG_CHECK_MODULES check for libtls so that the appropriate values for LDFLAGS and CFLAGS are set -- but only do this is AC_SEARCH_LIBS fails; not every system will have an associated .pc file for pkg-config checks. Additionally, update the core Makefile.am to use .NOPARALLEL -- not every system honours .NOTPARALLEL.
Actions:
Patch | Tree
commit - 5e58eeb52e28b9e972de6441089a9b7b6b5608c9
commit + f6fb796a41af1721a0e62904bb413fd6ca8d4f33
blob - 435da03e353746f6b031c949a3cd7da6f055e245
blob + 27118bc80549c1eab235d281888b8ff40a65e8dc
--- Makefile.am
+++ Makefile.am
@@ -84,7 +84,9 @@ pagebundler$(EXEEXT): pagebundler.c
 	$(HOSTCC) $(HOSTCFLAGS) -o $@ $(srcdir)/pagebundler.c
 
 # ugly; builds bundled libgrapheme if needed
-.NOTPARALLEL $(LIBGRAPHEME):
+.NOTPARALLEL:
+.NOPARALLEL:
+$(LIBGRAPHEME):
 	${MAKE} -C $(srcdir)/libgrapheme libgrapheme.a
 
 clean-local:
blob - de52ae6fa787bc5c66f15fc3ecf26f8f4ae85a97
blob + 3b66571a2374813247041b0c445fd305165a84db
--- configure.ac
+++ configure.ac
@@ -122,8 +122,13 @@ AC_SEARCH_LIBS([keyname], [ncursesw ncurses tinfow tin
 	AC_MSG_ERROR([requires either ncursesw or ncurses library with terminfo support])
 ])
 
-AC_SEARCH_LIBS([tls_init], [tls], [], [
-	AC_MSG_ERROR([requires libtls])
+AC_SEARCH_LIBS([tls_init], [tls], [found_tls=yes], [found_tls=no])
+
+AS_IF([test "x$found_tls" = "xno"], [
+	PKG_CHECK_MODULES([libtls], [libtls], [
+		CFLAGS="$libtls_CFLAGS $CFLAGS"
+		LIBS="$libtls_LIBS $LIBS"
+	], [AC_MSG_ERROR([libtls not found.])])
 ])
 
 PKG_CHECK_MODULES([libgrapheme], [libgrapheme], [