From 06c997deee7e41c73d8f8079f5420fb5e5f785c3 Mon Sep 17 00:00:00 2001
From: Mirek Kratochvil <exa.exa@gmail.com>
Date: Sat, 20 Apr 2013 13:47:41 +0200
Subject: [PATCH] some lib/header/autotools cleaning

---
 configure.ac    | 23 +++++++++++++++++++++--
 src/keyring.cpp |  2 +-
 src/ripemd128.c |  2 +-
 src/ripemd128.h |  2 +-
 src/sha_hash.h  |  2 +-
 5 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2e16ea2..848bac5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,12 +6,31 @@ AC_CONFIG_AUX_DIR(.) # because of libtoolize
 AM_INIT_AUTOMAKE()
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])
 
+LT_INIT
+
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_CXX
 AC_PROG_CPP
 AC_PROG_INSTALL
-AC_PROG_LIBTOOL
 
-AC_OUTPUT(Makefile)
+#check for compilable GMP presence
+AC_CHECK_HEADERS([gmp.h], , AC_MSG_ERROR([Codecrypt requires gmp.h]))
+AC_CHECK_LIB(gmp, __gmpz_init, , AC_MSG_ERROR([Codecrypt requires libgmp]))
 
+#check for standard functions
+AC_CHECK_FUNCS([memset mkdir], , AC_MSG_ERROR([Required function missing]))
+
+#unixy headers
+AC_CHECK_HEADERS([fcntl.h inttypes.h stddef.h stdlib.h string.h sys/file.h unistd.h], , AC_MSG_ERROR([Required header file missing]))
+
+#other used stuff
+AC_CHECK_HEADER_STDBOOL
+AC_C_INLINE
+AC_TYPE_SIZE_T
+AC_TYPE_UINT32_T
+AC_TYPE_UINT64_T
+AC_TYPE_UINT8_T
+
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff --git a/src/keyring.cpp b/src/keyring.cpp
index 0b3504d..3eef0e0 100644
--- a/src/keyring.cpp
+++ b/src/keyring.cpp
@@ -30,7 +30,7 @@ void keyring::clear()
  */
 
 #include "sha2.h"
-#include <stdint.h>
+#include <inttypes.h>
 
 std::string keyring::get_keyid (const std::string&pubkey)
 {
diff --git a/src/ripemd128.c b/src/ripemd128.c
index d31e7a9..eb71aed 100644
--- a/src/ripemd128.c
+++ b/src/ripemd128.c
@@ -16,7 +16,7 @@
 */
 
 #include <stddef.h>
-#include <stdint.h>
+#include <inttypes.h>
 #include <string.h>
 
 #include "ripemd128.h"
diff --git a/src/ripemd128.h b/src/ripemd128.h
index e3490d0..1126c20 100644
--- a/src/ripemd128.h
+++ b/src/ripemd128.h
@@ -24,7 +24,7 @@ extern "C" {
 
 #define RIPEMD128_DIGEST_LENGTH 16
 #include <stddef.h>
-#include <stdint.h>
+#include <inttypes.h>
 
 	struct ampheck_ripemd128 {
 		uint32_t h[4];
diff --git a/src/sha_hash.h b/src/sha_hash.h
index e5a51f4..0c6f565 100644
--- a/src/sha_hash.h
+++ b/src/sha_hash.h
@@ -21,7 +21,7 @@
 
 #include "hash.h"
 #include "sha2.h"
-#include <stdint.h>
+#include <inttypes.h>
 
 class sha256hash : public hash_func
 {