[Minor] Arrrgh, stupid cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e775f4381ae90e96973b9b4123668bdb53ef533..306f2a33f65c60d3d1411e19b721e499705e906e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -737,7 +737,7 @@ IF (ENABLE_GD MATCHES "ON")
        CHECK_SYMBOL_EXISTS(gdImageCreateFromBmpPtr gd.h GD_GIF)
 
        IF(GD_INTERPOLATION AND GD_SCALE AND GD_GRAYSCALE AND GD_JPEG AND GD_PNG AND GD_GIF AND GD_BMP)
-               SET(WITH_GD 1)
+               SET(USABLE_GD 1)
        ELSE()
                MESSAGE(STATUS "Libgd is found but it is unusable")
        ENDIF()

diff --git a/config.h.in b/config.h.in
index f8db7b3cea15da499f6c2a27fbae23c197ea7f44..a8cbd95fab642d0248acbfaa16bb45a65cf06778 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -124,7 +124,7 @@
 #cmakedefine PARAM_H_HAS_BITSET  1
 #cmakedefine WITH_DB             1
 #cmakedefine WITH_FANN           1
-#cmakedefine WITH_GD             1
+#cmakedefine USABLE_GD           1
 #cmakedefine WITH_GPERF_TOOLS    1
 #cmakedefine WITH_HIREDIS        1
 #cmakedefine WITH_HYPERSCAN      1

diff --git a/src/libmime/images.c b/src/libmime/images.c
index 454c1e5fd34322b55cf5b337c9a73a13c4af8ab2..15ed6c6ecc5887ebe345be3506ea736510e0977b 100644 (file)
--- a/src/libmime/images.c
+++ b/src/libmime/images.c
@@ -19,7 +19,7 @@
 #include "message.h"
 #include "html.h"
 
-#ifdef WITH_GD
+#ifdef USABLE_GD
 #include "gd.h"
 #include <math.h>
 
@@ -209,7 +209,7 @@ process_bmp_image (struct rspamd_task *task, GByteArray *data)
        return img;
 }
 
-#ifdef WITH_GD
+#ifdef USABLE_GD
 /*
  * DCT from Emil Mikulic.
  * http://unix4lyfe.org/dct/
@@ -345,7 +345,7 @@ rspamd_image_dct_block (gint pixels[8][8], gdouble *out)
 static void
 rspamd_image_normalize (struct rspamd_task *task, struct rspamd_image *img)
 {
-#ifdef WITH_GD
+#ifdef USABLE_GD
        gdImagePtr src = NULL, dst = NULL;
        guint i, j, k, l;