commit e8cb16bff48dbe2d9efd988ddb09608406d2633b
author Adrian Johnson <ajohnson@redneon.com> Sun Sep 27 15:34:12 2015 +0930
committer Adrian Johnson <ajohnson@redneon.com> Sun Sep 27 23:55:17 2015 +0930
tree c847942942a1a0a3acb70074663bb94f837b11ab
parent a82e338b4f9639aced3201bf7639bbdf1a7974e2

configure: fix openjpeg detection

- configure was failing when enable_libopenjpeg="auto" and openjpeg not found
- fix header check for pre 1.4 versions

Bug 92135

configure.ac

diff --git a/configure.ac b/configure.ac
index 4bc1524..bfdfe23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -219,14 +219,14 @@
       [openjpeg1="yes"
        LIBOPENJPEG_LIBS="-lopenjpeg"],[openjpeg_header=no])
      AC_CHECK_HEADERS([openjpeg.h],,
-		      [openjpeg="no"])])
+		      [openjpeg_header="no"])])
 fi
 
 dnl test for libopenjpeg2
 if test x$openjpeg1 = xno; then
   if test x$enable_libopenjpeg = xopenjpeg2 || test x$enable_libopenjpeg = xauto; then
     PKG_CHECK_MODULES(LIBOPENJPEG, libopenjp2,
-                      [openjpeg2=yes],[])
+                      [openjpeg2=yes],[openjpeg2=no])
   fi
 fi