[trunk] correct missing variable in openjpeg config file

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 483cc24286f6daa2011b033c947613a1d3fc51dd..49da7c460cc76aeee3702eac2e4c464058dc0dce 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -182,10 +182,11 @@ endif()
 #-----------------------------------------------------------------------------
 # opj_config.h generation
 include (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
+CHECK_INCLUDE_FILE("stdint.h"       OPJ_HAVE_STDINT_H)
+CHECK_INCLUDE_FILE("inttypes.h"     OPJ_HAVE_INTTYPES_H)
+
 CHECK_INCLUDE_FILE("strings.h"      HAVE_STRINGS_H)
-CHECK_INCLUDE_FILE("inttypes.h"     HAVE_INTTYPES_H)
 CHECK_INCLUDE_FILE("memory.h"       HAVE_MEMORY_H)
-CHECK_INCLUDE_FILE("stdint.h"       OPJ_HAVE_STDINT_H)
 CHECK_INCLUDE_FILE("stdlib.h"       HAVE_STDLIB_H)
 CHECK_INCLUDE_FILE("stdio.h"        HAVE_STDIO_H)
 CHECK_INCLUDE_FILE("string.h"       HAVE_STRING_H)

diff --git a/src/lib/openjp2/opj_config.h.cmake.in b/src/lib/openjp2/opj_config.h.cmake.in
index aed6dbc5ab238d73a17aae7a0aa7bf724a24ec15..d922d1169b7ddf0b1e23061475f0f3aa9f30105f 100644 (file)
--- a/src/lib/openjp2/opj_config.h.cmake.in
+++ b/src/lib/openjp2/opj_config.h.cmake.in
@@ -1,10 +1,10 @@
 /* create config.h for CMake */
-#cmakedefine OPJ_HAVE_STDINT_H @OPJ_HAVE_STDINT_H@
+#cmakedefine OPJ_HAVE_STDINT_H                 @OPJ_HAVE_STDINT_H@
+#cmakedefine OPJ_HAVE_INTTYPES_H       @OPJ_HAVE_INTTYPES_H@
 
 #define OPJ_PACKAGE_VERSION "@PACKAGE_VERSION@"
 
 /* Not used by openjp2*/
-/*#cmakedefine HAVE_INTTYPES_H @HAVE_INTTYPES_H@*/
 /*#cmakedefine HAVE_MEMORY_H @HAVE_MEMORY_H@*/
 /*#cmakedefine HAVE_STDLIB_H @HAVE_STDLIB_H@*/
 /*#cmakedefine HAVE_STRINGS_H @HAVE_STRINGS_H@*/

diff --git a/src/lib/openjp2/opj_inttypes.h b/src/lib/openjp2/opj_inttypes.h
index d6a2926377d895d996bc53c3bf889208fcc3cb61..f94f648b085fea3538b6e717b96b9b31a4d84107 100644 (file)
--- a/src/lib/openjp2/opj_inttypes.h
+++ b/src/lib/openjp2/opj_inttypes.h
@@ -27,7 +27,7 @@
 #define OPJ_INTTYPES_H
 
 #include "opj_config.h"
-#ifdef HAVE_INTTYPES_H
+#ifdef OPJ_HAVE_INTTYPES_H
 #include <inttypes.h>
 #else
 #if defined(_WIN32)