[trunk] correct the new name of OPJ_HAVE_STDINT_H everywhere

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 926a6ac1a282b48108f87a95a92b0eb016e18c20..4c7c825ce5e0533282de47c0c3fb118ae0bf9355 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -185,7 +185,7 @@ 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"       HAVE_STDINT_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 91772ef9b52c51792b3bcc6f7e006470eeb899d5..6bc268efb799703b01348a4e535e8e01c9f5bf10 100644 (file)
--- a/src/lib/openjp2/opj_config.h.cmake.in
+++ b/src/lib/openjp2/opj_config.h.cmake.in
@@ -1,5 +1,5 @@
 /* create config.h for CMake */
-#cmakedefine OPJ_HAVE_STDINT_H @HAVE_STDINT_H@
+#cmakedefine OPJ_HAVE_STDINT_H @OPJ_HAVE_STDINT_H@
 
 #define OPJ_PACKAGE_VERSION "@PACKAGE_VERSION@"