Configuring and building jpeg library

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@11 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/Makefile.in b/Makefile.in
index 789e11951834df65368183931078cddc499c4979..dbed5f8d24ab8ce5fc61680c2568da0e3c27dc58 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 
-SUBDIRS = @ZLIB_DIR@ rdr network Xregion rfb tx x0vncserver vncviewer_unix \
+SUBDIRS = @ZLIB_DIR@ @JPEG_DIR@ rdr network Xregion rfb tx x0vncserver vncviewer_unix \
           vncconfig_unix vncpasswd
 
 # followed by boilerplate.mk

diff --git a/configure.in b/configure.in
index cbad4603f6dcf34692a3dbf0bdc5ce88fd825587..0656694cb1ca1b88d4a5857123762b7424566bc5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -63,6 +63,26 @@ AC_SUBST(ZLIB_DIR)
 AC_SUBST(ZLIB_INCLUDE)
 AC_SUBST(ZLIB_LIB)
 
+AC_ARG_WITH(installed-jpeg,
+[  --with-installed-jpeg   use the version of jpeg which is installed on the
+                          system instead of the one distributed with VNC])
+
+if test "$with_installed_jpeg" = yes; then
+  echo "using installed jpeg"
+  JPEG_LIB=-ljpeg
+else
+  JPEG_DIR=jpeg
+  JPEG_INCLUDE='-I$(top_srcdir)/jpeg'
+  JPEG_LIB='$(top_srcdir)/jpeg/libjpeg.a'
+  echo "configuring jpeg..."
+  (cd jpeg; ./configure)
+  echo "...done configuring jpeg"
+fi
+
+AC_SUBST(JPEG_DIR)
+AC_SUBST(JPEG_INCLUDE)
+AC_SUBST(JPEG_LIB)
+
 AC_CHECK_FUNC(vsnprintf,VSNPRINTF_DEFINE='-DHAVE_VSNPRINTF',VSNPRINTF_DEFINE=)
 AC_SUBST(VSNPRINTF_DEFINE)