[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
- [PATCH 08/21] configure.ac, Makefile.in: Use CC_FOR_BUILD for native compilation., (continued)
- [PATCH 08/21] configure.ac, Makefile.in: Use CC_FOR_BUILD for native compilation., John Darrington, 2014/01/12
- [PATCH 04/21] Fix crash on startup if the configuration file is missing., John Darrington, 2014/01/12
- [PATCH 13/21] Improve reliability of freetype library (esp. wrt cross-building), John Darrington, 2014/01/12
- [PATCH 05/21] base/lib.mak: Fix broken build dependency, John Darrington, 2014/01/12
- [PATCH 10/21] Fix test for dbus when cross building, John Darrington, 2014/01/12
- [PATCH 11/21] Fix incorrect determination of host/build OS, John Darrington, 2014/01/12
- [PATCH 17/21] Avoid redundancy in package version number/string, John Darrington, 2014/01/12
- [PATCH 16/21] Remove the code running ./configure from autogen.sh - I am of the opinion, that the bootstrap process and the configuration should be kept seperate. It should be possible to bootstrap without configuring., John Darrington, 2014/01/12
- [PATCH 20/21] Remove 'exe' suffix from GS variable., John Darrington, 2014/01/12
- [PATCH 21/21] Do install contrib drivers if the --disable-contrib option was chosen., John Darrington, 2014/01/12
- [PATCH 14/21] Remove broken test for OpenJpeg library.,
John Darrington <=
- [PATCH 12/21] Minor re-ordering of configure.ac, John Darrington, 2014/01/12
- [PATCH 03/21] doc/gs-vms.htp: Gnu policy is not to acknowledge trademarks., John Darrington, 2014/01/12
- [PATCH 15/21] Correct bad directories for ROMFS_OBJS, John Darrington, 2014/01/12
- [PATCH 18/21] Remove hard coded variables for tools (eg: SHELL)., John Darrington, 2014/01/12
- [PATCH 19/21] Remove duplicate assignment to EXTRALIBS, John Darrington, 2014/01/12