[Libreoffice-commits] core.git: configure.ac

[Riccardo Magliocchetti]

 configure.ac |   11 +++++++++++
 1 file changed, 11 insertions(+)

New commits:
commit fbdfd76d357ef82cacafdf12228b0025374fbc20
Author: Riccardo Magliocchetti <riccardo.magliocchetti at gmail.com>
Date:   Mon May 6 12:55:22 2013 +0200

    configure: check libjpeg having JERR_BAD_CROP_SPEC defined
    
    b5a9cc71 introduced the use of JERR_BAD_CROP_SPEC which is not
    available in Ubuntu 11.10 version of libjpeg62. So better
    catch this at configure time.
    
    Change-Id: I19e4287b0c1a9ddc0baaa70ab61364f99571682c
    Reviewed-on: https://gerrit.libreoffice.org/3796
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/configure.ac b/configure.ac
index 49e8d02..556f946 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7135,6 +7135,17 @@ if test "$with_system_jpeg" = "yes"; then
         [AC_MSG_ERROR(jpeg.h not found. install libjpeg)], [])
     AC_CHECK_LIB(jpeg, jpeg_resync_to_restart, [ JPEG3RDLIB=-ljpeg ],
     [AC_MSG_CHECKING(jpeg library not found or fuctional)], [])
+    AC_MSG_CHECKING([[libjpeg version is 7 or greater]])
+	AC_COMPILE_IFELSE([ AC_LANG_SOURCE(
+			  [[
+#include <stdio.h>
+#include <jerror.h>
+int main(int c, char**v) { printf("%d\n", JERR_BAD_CROP_SPEC); return 0; }
+			  ]]) ],
+			  [AC_MSG_RESULT(yes)],
+		          [AC_MSG_RESULT(no)
+                           AC_MSG_ERROR(jpeg library version >= 7 required)
+                          ])
     libo_MINGW_CHECK_DLL([libjpeg])
 else
     AC_MSG_RESULT([internal])