external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

configure: detect and use jpeg library

Browse source
This commit is contained in:
Jon Trulson 2020-01-05 16:20:35 -07:00
parent 00dcd9c63d
commit 4d12673147
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cde/configure.ac
View file

@ -126,7 +126,7 @@ dnl set CSRG_BASED define for the BSD's
if test "$bsd" = "yes" if test "$bsd" = "yes"
then then
SOURCE_CPP_DEFINES="${SOURCE_CPP_DEFINES} -DCSRG_BASED" 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" MOTIF_INC="-I/usr/local/include -I/usr/X11R6/include/freetype2 -I/usr/local/include/freetype2"
fi fi
@ -368,6 +368,12 @@ AC_CHECK_LIB(tirpc, svc_register,
TIRPCLIB=-ltirpc]) TIRPCLIB=-ltirpc])
AC_SUBST(TIRPCLIB) 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 Setup XTOOLLIB - we do it in this specific order to avoid ordering
dnl issues dnl issues
XTOOLLIB="" XTOOLLIB=""

2
cde/lib/DtHelp/Makefile.am
View file

@ -13,7 +13,7 @@ libDtHelp_la_CFLAGS = -I./il -I./jpeg -I../DtSvc/DtUtil2 -DDTLIB \
-DCDE_CONFIGURATION_TOP='"$(CDE_CONFIGURATION_TOP)"' \ -DCDE_CONFIGURATION_TOP='"$(CDE_CONFIGURATION_TOP)"' \
@DT_INCDIR@ @DTI_INCDIR@ @DT_INCDIR@ @DTI_INCDIR@
libDtHelp_la_LIBADD = -ljpeg il/libil.la libDtHelp_la_LIBADD = $(JPEGLIB) il/libil.la
if SOLARIS if SOLARIS
libDtHelp_la_CFLAGS += -DICONV_INBUF_CONST=const -DLSB_BIT_ORDER libDtHelp_la_CFLAGS += -DICONV_INBUF_CONST=const -DLSB_BIT_ORDER