From dc700d5d50ed666a934295cd1290126d9504d48e Mon Sep 17 00:00:00 2001 From: Luis Ibanez Date: Tue, 7 Sep 2010 22:24:12 +0000 Subject: [PATCH] ENH: Now verifies if the OPJ_STATIC macro is not already defined, before it defines it. --- openjpegConfigure.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openjpegConfigure.h.in b/openjpegConfigure.h.in index 93e326a5..d423c6a7 100644 --- a/openjpegConfigure.h.in +++ b/openjpegConfigure.h.in @@ -39,7 +39,7 @@ #cmakedefine OPENJPEG_USE_SYSTEM_ZLIB #cmakedefine BUILD_SHARED_LIBS -#if !defined(BUILD_SHARED_LIBS) +#if !defined(BUILD_SHARED_LIBS) && !defined(OPJ_STATIC) #define OPJ_STATIC #endif