summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis Ibanez <luis.ibanez@gmail.com>2010-09-07 22:24:12 +0000
committerLuis Ibanez <luis.ibanez@gmail.com>2010-09-07 22:24:12 +0000
commitdc700d5d50ed666a934295cd1290126d9504d48e (patch)
treeae5681af1703e2e860d67e7e50dcdcf389e8242e
parent00f7af7748b549a1cb99852ba5c886483847f892 (diff)
ENH: Now verifies if the OPJ_STATIC macro is not
already defined, before it defines it.
-rw-r--r--openjpegConfigure.h.in2
1 files changed, 1 insertions, 1 deletions
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