[Forensics-changes] [yara] 177/192: Remove dependencies from “config.h”

[Hilko Bengen]

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

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

commit 2c169dff389594a31a5fa643eedb742a8ec42dbe
Author: plusvic <plusvic at gmail.com>
Date:   Mon May 15 18:38:52 2017 +0200

    Remove dependencies from “config.h”
---
 configure.ac                    | 1 -
 libyara/include/yara/endian.h   | 1 -
 libyara/include/yara/mem.h      | 2 --
 libyara/include/yara/strutils.h | 2 --
 libyara/modules.c               | 4 +---
 libyara/modules/pe.c            | 1 -
 libyara/strutils.c              | 2 --
 yara.c                          | 7 +++----
 yarac.c                         | 6 +++---
 9 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2d129d1..8f4da59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -155,6 +155,5 @@ AM_CONDITIONAL([GCC], [test "x$GCC" = xyes])
 
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([libyara/Makefile])
-AC_CONFIG_HEADERS([config.h])
 
 AC_OUTPUT
diff --git a/libyara/include/yara/endian.h b/libyara/include/yara/endian.h
index fc44525..42c76a1 100644
--- a/libyara/include/yara/endian.h
+++ b/libyara/include/yara/endian.h
@@ -31,7 +31,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define YR_ENDIAN_H
 
 #include <yara/integers.h>
-#include <config.h>
 
 
 #if defined(__has_builtin)
diff --git a/libyara/include/yara/mem.h b/libyara/include/yara/mem.h
index e3d9c51..ff7dc3e 100644
--- a/libyara/include/yara/mem.h
+++ b/libyara/include/yara/mem.h
@@ -32,8 +32,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <stdio.h>
 
-#include "config.h"
-
 #ifdef DMALLOC
 
 #define yr_malloc malloc
diff --git a/libyara/include/yara/strutils.h b/libyara/include/yara/strutils.h
index 5f151e6..bc72bf5 100644
--- a/libyara/include/yara/strutils.h
+++ b/libyara/include/yara/strutils.h
@@ -35,8 +35,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <yara/integers.h>
 
-#include "config.h"
-
 // Cygwin already has these functions.
 #if defined(_WIN32) && !defined(__CYGWIN__)
 #if defined(_MSC_VER) && _MSC_VER < 1900
diff --git a/libyara/modules.c b/libyara/modules.c
index f0cc0cc..6299595 100644
--- a/libyara/modules.c
+++ b/libyara/modules.c
@@ -27,8 +27,6 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include <config.h>
-
 #include <yara/exec.h>
 #include <yara/modules.h>
 #include <yara/libyara.h>
@@ -157,7 +155,7 @@ int yr_modules_load(
     yr_object_destroy(module_structure);
     return ERROR_CALLBACK_ERROR;
   }
-    
+
   FAIL_ON_ERROR_WITH_CLEANUP(
       yr_modules_do_declarations(module_name, module_structure),
       yr_object_destroy(module_structure));
diff --git a/libyara/modules/pe.c b/libyara/modules/pe.c
index 2332aa6..634515f 100644
--- a/libyara/modules/pe.c
+++ b/libyara/modules/pe.c
@@ -32,7 +32,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <stdio.h>
 #include <ctype.h>
 #include <time.h>
-#include <config.h>
 
 #if defined(HAVE_LIBCRYPTO)
 #include <openssl/md5.h>
diff --git a/libyara/strutils.c b/libyara/strutils.c
index 52fcebd..1bd0a15 100644
--- a/libyara/strutils.c
+++ b/libyara/strutils.c
@@ -32,8 +32,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <yara/strutils.h>
 
-#include "config.h"
-
 uint64_t xtoi(
     const char* hexstr)
 {
diff --git a/yara.c b/yara.c
index a426e01..ff0f983 100644
--- a/yara.c
+++ b/yara.c
@@ -53,7 +53,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "args.h"
 #include "threading.h"
-#include "config.h"
 
 
 #define ERROR_COULD_NOT_CREATE_THREAD  100
@@ -1024,7 +1023,7 @@ int main(
 
   if (show_version)
   {
-    printf("%s\n", PACKAGE_STRING);
+    printf("%s\n", YR_VERSION);
     return EXIT_SUCCESS;
   }
 
@@ -1034,10 +1033,10 @@ int main(
       "YARA %s, the pattern matching swiss army knife.\n"
       "%s\n\n"
       "Mandatory arguments to long options are mandatory for "
-      "short options too.\n\n", PACKAGE_VERSION, USAGE_STRING);
+      "short options too.\n\n", YR_VERSION, USAGE_STRING);
 
     args_print_usage(options, 35);
-    printf("\nSend bug reports and suggestions to: %s.\n", PACKAGE_BUGREPORT);
+    printf("\nSend bug reports and suggestions to: vmalvarez at virustotal.com.\n");
 
     return EXIT_SUCCESS;
   }
diff --git a/yarac.c b/yarac.c
index 35a3246..933b787 100644
--- a/yarac.c
+++ b/yarac.c
@@ -47,7 +47,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <yara.h>
 
 #include "args.h"
-#include "config.h"
+
 
 #ifndef MAX_PATH
 #define MAX_PATH 256
@@ -197,7 +197,7 @@ int main(
 
   if (show_version)
   {
-    printf("%s\n", PACKAGE_STRING);
+    printf("%s\n", YR_VERSION);
     return EXIT_SUCCESS;
   }
 
@@ -206,7 +206,7 @@ int main(
     printf("%s\n\n", USAGE_STRING);
 
     args_print_usage(options, 35);
-    printf("\nSend bug reports and suggestions to: %s.\n", PACKAGE_BUGREPORT);
+    printf("\nSend bug reports and suggestions to: vmalvarez at virustotal.com\n");
 
     return EXIT_SUCCESS;
   }

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