Merge branch 'master' into utf8-conversion, after 2.3.0a release

2019-10-12 19:17:42 -06:00
parent ddc3c8857b 34b5ee08c8
commit 2e4deb41c0
13 changed files with 43 additions and 63 deletions
--- a/cde/config/cf/OpenBSD.cf
+++ b/cde/config/cf/OpenBSD.cf
@@ -1072,6 +1072,7 @@ CXXDEPENDINCLUDE != CcCmd -v -x c++ /dev/null -fsyntax-only \
 #define ArchitectureDefines    -DOPENBSD_ARCHITECTURE

 #define BuildLibPathVar        LD_LIBRARY_PATH
+ICONVSYSLIB != if test -f /usr/local/include/iconv.h; then echo -liconv; else echo; fi

 #ifndef KornShell
 #define KornShell               /usr/local/bin/ksh93