diff options
| author | Adam Tkac <atkac@redhat.com> | 2008-06-11 15:24:16 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@redhat.com> | 2008-06-11 15:24:16 +0000 |
| commit | 4d60e0338779459d8b9746b8b21894b43afba142 (patch) | |
| tree | ee5a97b377227533a792236a2b7850ea491c72ce | |
| parent | 1719941c715cf38968aed67604fc153ef12a071a (diff) | |
| download | tigervnc-4d60e0338779459d8b9746b8b21894b43afba142.tar.gz tigervnc-4d60e0338779459d8b9746b8b21894b43afba142.zip | |
Replaced --with-tight-{jpeg,zlib} configure parameters by --with-included-{jpeg,zlib}
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1.5-xserver@2582 3789f03b-4d11-0410-bbf8-ca57d06f2519
| -rw-r--r-- | common/configure.ac | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/common/configure.ac b/common/configure.ac index 096fe7df..c72164a3 100644 --- a/common/configure.ac +++ b/common/configure.ac @@ -56,12 +56,12 @@ AC_CHECK_LIB(dmedia, dmICCreate, LIBS="$LIBS -ldmedia"]) AM_CONDITIONAL([IRIX_MEDIA], [ test "x$IRIX_MEDIA" = xyes ]) -AC_ARG_WITH([tight-zlib], - AS_HELP_STRING([--with-tight-zlib], +AC_ARG_WITH([included-zlib], + AS_HELP_STRING([--with-included-zlib], [use libz which is distributed with VNC]), - [], [with_tight_zlib='no']) + [], [with_included_zlib='no']) -if test "x$with_tight_zlib" = xno; then +if test "x$with_included_zlib" = xno; then AC_SEARCH_LIBS([inflateEnd], [z], [ZLIB_LIB='-lz'], [ZLIB_DIR=zlib @@ -79,12 +79,12 @@ AC_SUBST(ZLIB_LIB) AC_CONFIG_SUBDIRS([zlib]) -AC_ARG_WITH([tight-jpeg], - AS_HELP_STRING([--with-tight-jpeg], +AC_ARG_WITH([included-jpeg], + AS_HELP_STRING([--with-included-jpeg], [use libjpeg which is distributed with VNC]), - [], [with_tight_jpeg='no']) + [], [with_included_jpeg='no']) -if test "x$with_tight_jpeg" = xno; then +if test "x$with_included_jpeg" = xno; then AC_SEARCH_LIBS([jpeg_destroy_compress], [jpeg], [JPEG_LIB='-ljpeg'], [JPEG_DIR=jpeg |