Mercurial > hg > octave-image
changeset 20:4de573bbaf4b Octave-Forge-2002.05.09
Check for libjpeg during configure.
| author | pkienzle |
|---|---|
| date | Fri, 26 Apr 2002 11:54:10 +0000 |
| parents | 3e8ff3763b52 |
| children | ea70f05f08b7 |
| files | Makeconf.add Makefile configure.add |
| diffstat | 3 files changed, 37 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile +++ b/Makefile @@ -1,6 +1,10 @@ include ../../Makeconf -all: conv2.oct cordflt2.oct jpgwrite.oct jpgread.oct +ifdef HAVE_JPEG + JPEG=jpgwrite.oct jpgread.oct +endif + +all: conv2.oct cordflt2.oct $(JPEG) jpgread.oct: jpgread.cc $(MKOCTFILE) $< -ljpeg
new file mode 100644 --- /dev/null +++ b/configure.add @@ -0,0 +1,31 @@ + +if test -e main/image/NOINSTALL ; then + + dnl Not installing so don't test for libjpeg. + STATUS=noinstall + +else + + AC_DEFINE(have_jpeg) + AC_CHECK_HEADER(jpeglib.h, have_jpeg=yes, have_jpeg=no) + if test $have_jpeg = yes ; then + AC_CHECK_LIB(jpeg, jpeg_std_error, have_jpeg=yes, have_jpeg=no) + if test $have_jpeg = no ; then + STATUS="libjpeg library not found" + else + STATUS="yes" + AC_SUBST(DEFHAVE_JPEG) + DEFHAVE_GINAC="HAVE_JPEG=1" + fi + else + STATUS="jpeglib.h not found" + fi + +fi + +dnl Append the status message to the global status message. This will +dnl be displayed at the end of configuration so that the user doesn't +dnl have to scan the list for critical details. + +STATUS_MSG="$STATUS_MSG + read/write JPEG: $STATUS"