From 92b1e038c16be50d9b67d2bb72bb473ab8d2d753 Mon Sep 17 00:00:00 2001
From: Mickael Savinaud <savmickael@users.noreply.github.com>
Date: Wed, 13 Mar 2013 10:18:04 +0000
Subject: [PATCH] [trunk] correct missing variable in openjpeg config file

---
 CMakeLists.txt                        | 7 ++++---
 src/lib/openjp2/opj_config.h.cmake.in | 4 ++--
 src/lib/openjp2/opj_inttypes.h        | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 483cc242..49da7c46 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -182,10 +182,11 @@ endif()
 #-----------------------------------------------------------------------------
 # opj_config.h generation
 include (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
-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("inttypes.h"     OPJ_HAVE_INTTYPES_H)
+
+CHECK_INCLUDE_FILE("strings.h"      HAVE_STRINGS_H)
+CHECK_INCLUDE_FILE("memory.h"       HAVE_MEMORY_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 aed6dbc5..d922d116 100644
--- 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 d6a29263..f94f648b 100644
--- 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)