bug-ghostscript
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 14/21] Remove broken test for OpenJpeg library.


From: John Darrington
Subject: [PATCH 14/21] Remove broken test for OpenJpeg library.
Date: Sun, 12 Jan 2014 12:00:27 +0100

The test for the openjpeg code was both broken and unnecessary. Broken
because it would fail when running from outside the source tree;
unnecessary because the condition it was intended to test (viz the
existence of a file) must be true, because that file is shipped with
the tarball.

Therefore, this change simply removes the test.
---
 Makefile.in  |    2 +-
 configure.ac |    6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 637141d..758a866 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -264,7 +264,7 @@ address@hidden@
 # and source location and configuration flags for compiling in
 address@hidden@
 address@hidden@
address@hidden@
+JPXSRCDIR=$(top_srcdir)/@JPXDIR@
 address@hidden@
 
 # uncomment the following three lines and one of the last two to
diff --git a/configure.ac b/configure.ac
index 2c1435a..d6e2be0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1089,17 +1089,11 @@ AC_ARG_ENABLE([openjpeg], 
AC_HELP_STRING([--disable-openjpeg],
 
 if test "x$JPX_DECODER" = "x"; then
   if test "x$enable_openjpeg" != "xno"; then
-    AC_MSG_CHECKING([for local OpenJPEG library source])
-    if test -e $OPENJPEGDIR/libopenjpeg/openjpeg.h; then
-      AC_MSG_RESULT([yes])
       JPXDIR="$OPENJPEGDIR"
       JPX_DECODER=openjpeg
       SHARE_JPX=0
       JPX_AUTOCONF_CFLAGS="-DUSE_OPENJPEG_JP2"
       JPXDEVS='$(PSD)jpx.dev'
-    else
-      AC_MSG_RESULT([no])
-    fi
   fi
 fi
 
-- 
1.7.10.4




reply via email to

[Prev in Thread] Current Thread [Next in Thread]