configure: detect and use jpeg library

diff --git a/cde/configure.ac b/cde/configure.ac
index ab74b18593c1259bc1d1d1c6c4d98e51078be8ff..6173479b78fe9914b8566185d4a3cb8bf69fed55 100644 (file)
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -126,7 +126,7 @@ dnl set CSRG_BASED define for the BSD's
 if test "$bsd" = "yes"
 then
         SOURCE_CPP_DEFINES="${SOURCE_CPP_DEFINES} -DCSRG_BASED"
-        MOTIF_LIB="-L/usr/local/lib -R/usr/local/lib"
+        MOTIF_LIB="-L/usr/local/lib"
         MOTIF_INC="-I/usr/local/include -I/usr/X11R6/include/freetype2 -I/usr/local/include/freetype2"
 fi
 
@@ -368,6 +368,12 @@ AC_CHECK_LIB(tirpc, svc_register,
        TIRPCLIB=-ltirpc])
 AC_SUBST(TIRPCLIB)
 
+dnl jpeg
+AC_CHECK_LIB(jpeg, jpeg_read_header, [JPEGLIB="-ljpeg"],
+             [AC_MSG_ERROR([libjpeg not found, please install it])],
+             [$MOTIF_LIB $X_LIBS])
+AC_SUBST(JPEGLIB)
+
 dnl Setup XTOOLLIB - we do it in this specific order to avoid ordering
 dnl issues
 XTOOLLIB=""

diff --git a/cde/lib/DtHelp/Makefile.am b/cde/lib/DtHelp/Makefile.am
index c89a20a39e7b19e4d5b3c6e300902b628cc3c1ac..dc76171dd95ccfe4b4191f48061e9d7d0ec944de 100644 (file)
--- a/cde/lib/DtHelp/Makefile.am
+++ b/cde/lib/DtHelp/Makefile.am
@@ -13,7 +13,7 @@ libDtHelp_la_CFLAGS = -I./il -I./jpeg -I../DtSvc/DtUtil2 -DDTLIB \
                      -DCDE_CONFIGURATION_TOP='"$(CDE_CONFIGURATION_TOP)"' \
                      @DT_INCDIR@ @DTI_INCDIR@
 
-libDtHelp_la_LIBADD = -ljpeg il/libil.la
+libDtHelp_la_LIBADD = $(JPEGLIB) il/libil.la
 
 if SOLARIS
 libDtHelp_la_CFLAGS += -DICONV_INBUF_CONST=const -DLSB_BIT_ORDER