From 3f88160184833dfa119c6238eaa7363eea3c96ea Mon Sep 17 00:00:00 2001
From: Henrik Tidefelt <tidefelt@isy.liu.se>
Date: Sat, 28 Nov 2009 18:42:31 +0100
Subject: [PATCH] Detect libjpeg.

---
 configure.ac       |  7 +++++++
 m4/libjpeg.m4      | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 source/Makefile.am |  4 ++--
 3 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 m4/libjpeg.m4

diff --git a/configure.ac b/configure.ac
index d82961c4..143efc4f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,6 +58,7 @@ AC_CHECK_NANSIGNAL()
 
 # Check optional dependencies
 AM_PATH_LIBPNG()
+AM_PATH_LIBJPEG()
 
 # Checks for header files.
 AC_FUNC_ALLOCA
@@ -122,4 +123,10 @@ then
 WARNING:  The library \`libpng' was not found, or its version too low.  Without it, your Shapes compiler will lack some functionality."
 fi
 
+if test "X$HAVE_LIBJPEG" != "Xtrue"
+then
+  echo "\
+WARNING:  The library \`libjpeg' was not found.  Without it, your Shapes compiler will lack some functionality."
+fi
+
 AC_OUTPUT
diff --git a/m4/libjpeg.m4 b/m4/libjpeg.m4
new file mode 100644
index 00000000..7b307ea7
--- /dev/null
+++ b/m4/libjpeg.m4
@@ -0,0 +1,49 @@
+dnl Check to find the libjpeg headers/libraries
+
+AC_DEFUN([AM_PATH_LIBJPEG],
+[
+  AC_ARG_WITH(libjpeg-include,
+    [  --with-libjpeg-include=DIR Where libjpeg headers are installed],
+    LIBJPEG_CFLAGS="-I$withval", LIBJPEG_CFLAGS="" )
+
+  AC_ARG_WITH(libjpeg-lib,
+    [  --with-libjpeg-lib=DIR     Where the libjpeg library is installed],
+    LIBJPEG_LIBS="-L$withval", LIBJPEG_LIBS="" )
+
+  ac_save_CFLAGS="$CFLAGS"
+  ac_save_LIBS="$LIBS"
+
+  no_libjpeg=""
+
+  if test "x${LIBJPEG_CFLAGS}X" != xX ; then
+    CFLAGS = "$LIBJPEG_CFLAGS"
+  fi
+  if test "x${LIBJPEG_LIBS}X" != xX ; then
+    LIBS = "$LIBJPEG_LIBS"
+  fi
+
+  AC_CHECK_HEADERS(jpeglib.h,
+    ,
+		no_libjpeg=yes
+    [AC_MSG_WARN("libjpeg header files not found.")]
+  )
+
+  AC_CHECK_LIB(jpeg, jpeg_read_header,
+    [LIBJPEG_LIBS="$LIBJPEG_LIBS -ljpeg"],
+		no_libjpeg=yes
+    [AC_MSG_WARN("libjpeg libraries not found.")]
+  )
+
+  if test "x$no_libjpeg" = x ; then
+     AC_DEFINE_UNQUOTED(HAVE_LIBJPEG, true, [Define to true if libjpeg is installed])
+		 HAVE_LIBJPEG=true
+  else
+		 HAVE_LIBJPEG=false
+  fi
+
+  CFLAGS="$ac_save_CFLAGS"
+  LIBS="$ac_save_LIBS"
+  AC_SUBST(HAVE_LIBJPEG)
+  AC_SUBST(LIBJPEG_CFLAGS)
+  AC_SUBST(LIBJPEG_LIBS)
+])
diff --git a/source/Makefile.am b/source/Makefile.am
index 3640ff34..b666372d 100644
--- a/source/Makefile.am
+++ b/source/Makefile.am
@@ -17,9 +17,9 @@
 
 AM_CPPFLAGS = -Wall -Wsynth -DDISPATCHSTYLE=DISPATCHSTYLE_CASE \
               -D'RESOURCES_DIR="${pkgdatadir}"' \
-              ${GSL_CFLAGS} ${ZLIB_CFLAGS} ${LIBPNG_CFLAGS} -I${top_srcdir}/tools/include
+              ${GSL_CFLAGS} ${ZLIB_CFLAGS} ${LIBPNG_CFLAGS} ${LIBJPEG_CFLAGS} -I${top_srcdir}/tools/include
 AM_LDFLAGS = -lz -lm -lc
-LIBS = ${LIBICONV} ${GSL_LIBS} ${ZLIB_LIBS} ${LIBPNG_LIBS}
+LIBS = ${LIBICONV} ${GSL_LIBS} ${ZLIB_LIBS} ${LIBPNG_LIBS} ${LIBJPEG_LIBS}
 AM_LFLAGS = -olex.yy.c -d
 AM_YFLAGS = -dvt
 CLEANFILES = shapesparser.output SHAPES-VERSION-FILE
-- 
2.11.4.GIT