[Forensics-changes] [yara] 348/368: Rename defines used in conditional module compilation

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag v3.5.0
in repository yara.

commit 073c7b287f1c0e72d24b602ebdf91a2ae9cd3672
Author: plusvic <plusvic at gmail.com>
Date:   Wed Jun 29 19:35:42 2016 +0200

    Rename defines used in conditional module compilation
---
 configure.ac                | 14 +++++++-------
 libyara/Makefile.am         |  6 +++---
 libyara/modules/module_list |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/configure.ac b/configure.ac
index b00865e..3ba576a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,7 +61,7 @@ AC_ARG_ENABLE([dmalloc],
   [if test x$enableval = xyes; then
     AC_CHECK_LIB(dmalloc, dmalloc_malloc,,
       AC_MSG_ERROR([please install dmalloc library]))
-    AC_DEFINE([DMALLOC], [1], [enable dmalloc])
+    CFLAGS="$CFLAGS -DDMALLOC"
   fi])
 
 AC_ARG_ENABLE([cuckoo],
@@ -70,7 +70,7 @@ AC_ARG_ENABLE([cuckoo],
     build_cuckoo_module=true
     AC_CHECK_LIB(jansson, json_loadb,,
       AC_MSG_ERROR([please install Jansson library]))
-    AC_DEFINE([CUCKOO], [1], [enable cuckoo module])
+    CFLAGS="$CFLAGS -DCUCKOO_MODULE"
   fi])
 
 AC_ARG_ENABLE([magic],
@@ -79,7 +79,7 @@ AC_ARG_ENABLE([magic],
     build_magic_module=true
     AC_CHECK_LIB(magic, magic_open,,
       AC_MSG_ERROR([please install libmagic library]))
-    AC_DEFINE([MAGIC], [1], [enable magic module])
+    CFLAGS="$CFLAGS -DMAGIC_MODULE"
   fi])
 
 AC_ARG_WITH([crypto],
@@ -117,12 +117,12 @@ AS_IF([test "x$have_crypto" = "xno"],
   ],
   [
     build_hash_module=true
-    AC_DEFINE([HASH], [1], [enable hash module])
+    CFLAGS="$CFLAGS -DHASH_MODULE"
   ])
 
-AM_CONDITIONAL([CUCKOO], [test x$build_cuckoo_module = xtrue])
-AM_CONDITIONAL([MAGIC], [test x$build_magic_module = xtrue])
-AM_CONDITIONAL([HASH], [test x$build_hash_module = xtrue])
+AM_CONDITIONAL([CUCKOO_MODULE], [test x$build_cuckoo_module = xtrue])
+AM_CONDITIONAL([MAGIC_MODULE], [test x$build_magic_module = xtrue])
+AM_CONDITIONAL([HASH_MODULE], [test x$build_hash_module = xtrue])
 AM_CONDITIONAL([GCC], [test "x$GCC" = xyes])
 
 AC_CONFIG_FILES([Makefile])
diff --git a/libyara/Makefile.am b/libyara/Makefile.am
index 839f3e9..d122b8b 100644
--- a/libyara/Makefile.am
+++ b/libyara/Makefile.am
@@ -4,15 +4,15 @@ MODULES += modules/pe.c
 MODULES += modules/elf.c
 MODULES += modules/math.c
 
-if CUCKOO
+if CUCKOO_MODULE
 MODULES += modules/cuckoo.c
 endif
 
-if MAGIC
+if MAGIC_MODULE
 MODULES += modules/magic.c
 endif
 
-if HASH
+if HASH_MODULE
 MODULES += modules/hash.c
 endif
 
diff --git a/libyara/modules/module_list b/libyara/modules/module_list
index 1a0bd02..e9d2682 100644
--- a/libyara/modules/module_list
+++ b/libyara/modules/module_list
@@ -3,14 +3,14 @@ MODULE(pe)
 MODULE(elf)
 MODULE(math)
 
-#ifdef CUCKOO
+#ifdef CUCKOO_MODULE
 MODULE(cuckoo)
 #endif
 
-#ifdef MAGIC
+#ifdef MAGIC_MODULE
 MODULE(magic)
 #endif
 
-#ifdef HASH
+#ifdef HASH_MODULE
 MODULE(hash)
 #endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/yara.git