diff options
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | configure.in | 20 |
2 files changed, 21 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 789e1195..dbed5f8d 100644 --- 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 cbad4603..0656694c 100644 --- 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) |