From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 9 Dec 2016 16:02:31 +0000 (+0000)
Subject: [Minor] Arrrgh, stupid cmake
X-Git-Tag: 1.5.0~634
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fc1eb3ca9480c9550926dfabb39aa8b84cc19c9a;p=rspamd.git

[Minor] Arrrgh, stupid cmake
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e775f438..306f2a33f 100644
--- 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 f8db7b3ce..a8cbd95fa 100644
--- 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 454c1e5fd..15ed6c6ec 100644
--- 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;