fixes in autoconf scripts

4 files changed, 22 insertions, 16 deletions

diff --git a/acconfig.h b/acconfig.h
index 4c3ee30e01..8f5827e63e 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -30,4 +30,6 @@
 
 #undef NO_SIZE_T
 #undef NO_TIME_T
+
+#undef DEFINE_SIZE_T
  
\ No newline at end of file
diff --git a/configure.in b/configure.in
index 814c8fb689..14a98c92bf 100644
--- a/configure.in
+++ b/configure.in
@@ -64,7 +64,7 @@ opt_profiler_mode=$enableval)
 AC_MSG_RESULT($opt_profiler_mode)
 
 AC_MSG_RESULT([***
-*** Checking for required for compilation programs...
+*** Checking for compilation programs...
 ])
 
 AC_PROG_CC
@@ -173,7 +173,7 @@ if test $ac_cv_c_compiler_gnu != no; then
 fi
 
 AC_MSG_RESULT([***
-*** Detecting library capabilities...
+*** Detecting C library capabilities...
 ])
 
 AC_HEADER_STDC
@@ -244,14 +244,19 @@ AC_CHECK_SIZEOF(unsigned int, 4)
 AC_CHECK_SIZEOF(unsigned short int, 2)
 AC_CHECK_SIZEOF(unsigned char, 1)
 
-AC_CHECK_TYPE(size_t,,
+AC_CHECK_TYPE(size_t,
+DEFINE_SIZE_T="#include <sys/types.h>"
+AC_SUBST( DEFINE_SIZE_T)
+,
 AC_DEFINE(NO_SIZE_T)
+DEFINE_SIZE_T="typedef unsigned int size_t; typedef int ssize_t;"
+AC_SUBST( DEFINE_SIZE_T)
 ,[
-#ifdef HAVE_TIME_H
-# include <time.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
 #endif
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
 #endif
 ])
 
@@ -259,11 +264,11 @@ AC_DEFINE(NO_SIZE_T)
 AC_CHECK_TYPE(time_t,,
 AC_DEFINE(NO_TIME_T),
 [
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
+#ifdef HAVE_TIME_H
+# include <time.h>
 #endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
 #endif
 ]
 )
diff --git a/lib/defines.h b/lib/defines.h
index f717b57c80..6cb52adff7 100644
--- a/lib/defines.h
+++ b/lib/defines.h
@@ -51,8 +51,6 @@
 # include <time.h>
 #endif
 
-
-/* for open */
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
@@ -82,6 +80,9 @@
 /* only used native uint64 in 64 bit machines */
  typedef unsigned long int uint64;
 #else
+/* some systems had problems with long long int, thus,
+ * it is not used.
+ */
  typedef struct { unsigned char i[8]; } uint64;
 #endif
 
diff --git a/lib/gnutls.h.in b/lib/gnutls.h.in
index 9485277de8..835ac16f5e 100644
--- a/lib/gnutls.h.in
+++ b/lib/gnutls.h.in
@@ -27,7 +27,7 @@ extern "C" {
 
 #define LIBGNUTLS_VERSION "@VERSION@"
 
-#include <sys/types.h>
+@DEFINE_SIZE_T@
 
 #define GNUTLS_AES GNUTLS_RIJNDAEL
 
@@ -114,8 +114,6 @@ int gnutls_is_fatal_error( int error);
 void gnutls_perror( int error);
 const char* gnutls_strerror( int error);
 
-#define gnutls_send(a,b,c,d,e) gnutls_write(a,b,c,d)
-#define gnutls_recv(a,b,c,d,e) gnutls_read(a,b,c,d)
 ssize_t gnutls_write( GNUTLS_STATE state, void *data, size_t sizeofdata);
 ssize_t gnutls_read( GNUTLS_STATE state, void *data, size_t sizeofdata);