From 1b3dd1256823e752599c20fc0a9a0d69e85d6808 Mon Sep 17 00:00:00 2001
From: Laxmikant Rashinkar <LK.Rashinkar@gmail.com>
Date: Sun, 23 Mar 2014 17:45:40 -0700
Subject: [PATCH] addec checks for TurboJPEG in autoconf

---
 configure.ac        | 27 +++++++++++++++++++++++++++
 libxrdp/Makefile.am |  4 ++--
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index ca9049eb..9f8dd04a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -127,6 +127,33 @@ then
     [AC_MSG_ERROR([please install libpulse-dev or libpulse-devel])])
 fi
 
+# checking for TurboJPEG
+if test ! -z "$TURBOJPEG_PATH"
+then
+  # env var TURBOJPEG_PATH has been defined, use that
+  AC_CHECK_HEADER([$TURBOJPEG_PATH/include/turbojpeg.h], [],
+    [AC_MSG_ERROR([could not find TurboJPEG in dir specified by env variable TURBOJPEG_PATH ($TURBOJPEG_PATH)])])
+
+   AC_SUBST(TurboJpegIncDir, ["-I$TURBOJPEG_PATH/include"])
+   AC_SUBST(TurboJpegLibDir, ["-L$TURBOJPEG_PATH/lib -Wl,-rpath -Wl,$TURBOJPEG_PATH/lib"])
+elif test -e /opt/libjpeg-turbo/lib64
+then
+  # TurboJPEG has been installed to /opt on a 64 bit m/c
+  AC_SUBST(TurboJpegIncDir, ["-I/opt/libjpeg-turbo/include"])
+  AC_SUBST(TurboJpegLibDir, ["-L/opt/libjpeg-turbo/lib64 -Wl,-rpath -Wl,/opt/libjpeg-turbo/lib64"])
+elif test -e /opt/libjpeg-turbo/lib32
+then
+  # TurboJPEG has been installed to /opt on a 32 bit m/c
+  AC_SUBST(TurboJpegIncDir, ["-I/opt/libjpeg-turbo/include"])
+  AC_SUBST(TurboJpegLibDir, ["-L/opt/libjpeg-turbo/lib32 -Wl,-rpath -Wl,/opt/libjpeg-turbo/lib32"])
+else
+  # check in default location
+  AC_CHECK_HEADER([/usr/include/turbojpeg.h], [],
+    [AC_MSG_ERROR([please install TurboJPEG ])])
+  AC_SUBST(TurboJpegIncDir, [""])
+  AC_SUBST(TurboJpegLibDir, [""])
+fi
+
 # checking for Xlib, Xfixes
 AC_CHECK_HEADER([X11/Xlib.h], [],
   [AC_MSG_ERROR([please install libx11-dev or libX11-devel])])
diff --git a/libxrdp/Makefile.am b/libxrdp/Makefile.am
index 567b87ef..bd37cad4 100644
--- a/libxrdp/Makefile.am
+++ b/libxrdp/Makefile.am
@@ -18,8 +18,8 @@ endif
 
 if XRDP_TJPEG
 EXTRA_DEFINES += -DXRDP_JPEG -DXRDP_TJPEG
-EXTRA_INCLUDES += -I/opt/libjpeg-turbo/include
-EXTRA_FLAGS += -L/opt/libjpeg-turbo/lib -Wl,-rpath -Wl,/opt/libjpeg-turbo/lib
+EXTRA_INCLUDES += @TurboJpegIncDir@
+EXTRA_FLAGS += @TurboJpegLibDir@
 EXTRA_LIBS += -lturbojpeg
 else
 if XRDP_JPEG