Merge branch 'master' into autotools-conversion

2020-01-26 12:17:44 -07:00
parent b46cfa7876 08b6281f60
commit 313b4a8e0b
8 changed files with 115 additions and 54 deletions
--- a/cde/lib/DtHelp/Imakefile
+++ b/cde/lib/DtHelp/Imakefile
@@ -38,8 +38,14 @@ DEFINES = -DDTLIB $(LOCAL_DEFINES) \
 	  -DOSMINORVERSION=OSMinorVersion \
 	  $(ICONV_INBUF_DEFINE) $(BIT_ORDER_DEFINES)

+#if defined(FreeBSDArchitecture)
+JPEGLIB = -ljpeg
+#endif
+
 #ifdef SharedDtHelpReqs
-REQUIREDLIBS = SharedDtHelpReqs
+REQUIREDLIBS = SharedDtHelpReqs $(JPEGLIB)
+#else
+REQUIREDLIBS = $(JPEGLIB)
 #endif

 HEADERS = \