diff options
| author | Chris Liddell <chris.liddell@artifex.com> | 2011-07-29 09:40:34 +0100 |
|---|---|---|
| committer | Chris Liddell <chris.liddell@artifex.com> | 2011-07-29 09:53:04 +0100 |
| commit | d248b98753421668ca683d074709a9422267b9ba (patch) | |
| tree | b440af2c9d4bb0e294ca100aefb38286829941ab | |
| parent | ea57ffb4eb8e3c2bd9ae80547cd7ad011631e212 (diff) | |
Change the expected directory for luratech.
For the build system to automatically include the luratech JPX and JBIG2
code, we previously checked for the existence of lwf_jp2 and ldf_jb2
directories under the Ghostscript source dir. This changes it to check
for <gs>/luratech/lwf_jp2 and <gs>/luratech/ldf_jb2 instead.
CLUSTER_UNTESTED
| -rw-r--r-- | gs/base/configure.ac | 8 | ||||
| -rw-r--r-- | gs/psi/msvc.mak | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/gs/base/configure.ac b/gs/base/configure.ac index 1e10144e0..19c37d6b0 100644 --- a/gs/base/configure.ac +++ b/gs/base/configure.ac @@ -878,11 +878,11 @@ AC_ARG_WITH([luratech], AC_HELP_STRING([--without-luratech], if test x$with_luratech != xno; then AC_MSG_CHECKING([for local Luratech JBIG2 library source]) - if test -d ldf_jb2; then + if test -d luratech/ldf_jb2; then AC_MSG_RESULT([yes]) JBIG2_DECODER=luratech SHARE_JBIG2=0 - JBIG2DIR=ldf_jb2 + JBIG2DIR=luratech/ldf_jb2 if test `uname` = Darwin*; then JBIG2_AUTOCONF_CFLAGS="-DUSE_LDF_JB2 -DMAC -DMAC_OS_X_BUILD" else @@ -955,11 +955,11 @@ JPX_AUTOCONF_CFLAGS= if test x$with_luratech != xno; then AC_MSG_CHECKING([for local Luratech JPEG2K library source]) - if test -d lwf_jp2; then + if test -d luratech/lwf_jp2; then AC_MSG_RESULT([yes]) JPX_DECODER=luratech SHARE_JASPER=0 - JPXDIR=lwf_jp2 + JPXDIR=luratech/lwf_jp2 if test `uname` = Darwin*; then JPX_AUTOCONF_CFLAGS="-DUSE_LWF_JP2 -DMAC -DMAC_OS_X_BUILD" else diff --git a/gs/psi/msvc.mak b/gs/psi/msvc.mak index 4b27776f3..0caaef4b6 100644 --- a/gs/psi/msvc.mak +++ b/gs/psi/msvc.mak @@ -277,7 +277,7 @@ ZSRCDIR=zlib # Define which jbig2 library to use !if !defined(JBIG2_LIB) && (!defined(NO_LURATECH) || "$(NO_LURATECH)" != "1") -!if exist("ldf_jb2") +!if exist("luratech\ldf_jb2") JBIG2_LIB=luratech !endif !endif @@ -290,7 +290,7 @@ JBIG2_LIB=jbig2dec # Set defaults for using the Luratech JB2 implementation !ifndef JBIG2SRCDIR # CSDK source code location -JBIG2SRCDIR=ldf_jb2 +JBIG2SRCDIR=luratech\ldf_jb2 !endif !ifndef JBIG2_CFLAGS # required compiler flags @@ -313,7 +313,7 @@ JBIG2SRCDIR=jbig2dec # Define which jpeg2k library to use !if !defined(JPX_LIB) && (!defined(NO_LURATECH) || "$(NO_LURATECH)" != "1") -!if exist("lwf_jp2") +!if exist("luratech\lwf_jp2") JPX_LIB=luratech !endif !endif @@ -808,7 +808,7 @@ SYNC=winsync # Set defaults for using the Luratech JP2 implementation !ifndef JPXSRCDIR # CSDK source code location -JPXSRCDIR=lwf_jp2 +JPXSRCDIR=luratech\lwf_jp2 !endif !ifndef JPX_CFLAGS # required compiler flags |