From: Simon Josefsson <simon@josefsson.org>
Date: Thu, 30 Oct 2008 18:12:59 +0000 (+0100)
Subject: Make it build better.
X-Git-Tag: gnutls_2_7_1~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa4e91e159e12cdb5d270533c2dffbbfcf3595d8;p=thirdparty%2Fgnutls.git

Make it build better.
---

diff --git a/configure.in b/configure.in
index a8a2f86847..1619952e36 100644
--- a/configure.in
+++ b/configure.in
@@ -186,25 +186,6 @@ AC_ARG_ENABLE(valgrind-tests,
   opt_valgrind_tests=$enableval)
 AC_MSG_RESULT($opt_valgrind_tests)
 
-# For minitasn1.
-AC_CHECK_SIZEOF(unsigned long int, 4)
-AC_CHECK_SIZEOF(unsigned int, 4)
-
-# For storing integers in pointers without warnings
-# http://developer.gnome.org/doc/API/2.0/glib/glib-Type-Conversion-Macros.html#desc
-AC_CHECK_SIZEOF(void *)
-AC_CHECK_SIZEOF(long)
-AC_CHECK_SIZEOF(int)
-case $ac_cv_sizeof_void_p in
-  $ac_cv_sizeof_long)
-    AC_DEFINE(GNUTLS_POINTER_TO_INT_CAST, [(long)],
-              [Additional cast to bring void* to a type castable to int.])
-    ;;
-  *)
-    AC_DEFINE(GNUTLS_POINTER_TO_INT_CAST, [])
-    ;;
-esac
-
 AC_CHECK_TYPES(uint,,, [
 # include <sys/types.h>
 ])
@@ -218,8 +199,6 @@ AC_CHECK_TYPE(ssize_t,
 	AC_SUBST(DEFINE_SSIZE_T)],
 	[#include <sys/types.h>])
 
-AC_C_BIGENDIAN
-
 AC_MSG_RESULT([***
 *** Checking for external libraries...
 ])
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 3c5bad1140..050b154a9a 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -160,7 +160,7 @@ gnutls-api.texi: $(COBJECTS) $(SRP_COBJECTS) $(PSK_COBJECTS) $(OPRFI_COBJECTS)
 	@echo "" > gnutls-api.texi
 	@for i in $(COBJECTS) $(SRP_COBJECTS) $(PSK_COBJECTS) $(OPRFI_COBJECTS); do \
 		echo -n "Creating documentation for file $$i... " && \
-		$(top_srcdir)/doc/scripts/gdoc -texinfo $$i >> gnutls-api.texi && \
+		$(srcdir)/../doc/scripts/gdoc -texinfo $$i >> gnutls-api.texi && \
 		echo "ok"; \
 	done
 
diff --git a/lib/configure.ac b/lib/configure.ac
index d894405670..1ca90f3ff9 100644
--- a/lib/configure.ac
+++ b/lib/configure.ac
@@ -40,6 +40,12 @@ AC_PROG_LIBTOOL
 
 LIBGNUTLS_HOOKS
 
+AC_C_BIGENDIAN
+
+# For minitasn1.
+AC_CHECK_SIZEOF(unsigned long int, 4)
+AC_CHECK_SIZEOF(unsigned int, 4)
+
 AC_ARG_WITH(zlib, AS_HELP_STRING([--without-zlib],
                                  [disable zlib compression support]),
             ac_zlib=$withval, ac_zlib=yes)
diff --git a/lib/m4/hooks.m4 b/lib/m4/hooks.m4
index d8224b7792..d02d4181e2 100644
--- a/lib/m4/hooks.m4
+++ b/lib/m4/hooks.m4
@@ -217,4 +217,19 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
                 [have_ld_version_script=$enableval],
                 [ : ] )
   AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
-])
\ No newline at end of file
+
+  # For storing integers in pointers without warnings
+  # http://developer.gnome.org/doc/API/2.0/glib/glib-Type-Conversion-Macros.html#desc
+  AC_CHECK_SIZEOF(void *)
+  AC_CHECK_SIZEOF(long)
+  AC_CHECK_SIZEOF(int)
+  case $ac_cv_sizeof_void_p in
+    $ac_cv_sizeof_long)
+      AC_DEFINE(GNUTLS_POINTER_TO_INT_CAST, [(long)],
+                [Additional cast to bring void* to a type castable to int.])
+      ;;
+    *)
+      AC_DEFINE(GNUTLS_POINTER_TO_INT_CAST, [])
+      ;;
+  esac
+])
diff --git a/lib/openpgp/Makefile.am b/lib/openpgp/Makefile.am
index a9447aa69a..951186103e 100644
--- a/lib/openpgp/Makefile.am
+++ b/lib/openpgp/Makefile.am
@@ -41,7 +41,7 @@ pgp-api.texi: $(COBJECTS)
 	@echo "" > pgp-api.texi
 	@for i in $(COBJECTS); do \
 		echo -n "Creating documentation for file $$i... " && \
-		$(top_srcdir)/doc/scripts/gdoc -texinfo $$i >> pgp-api.texi && \
+		$(srcdir)/../../doc/scripts/gdoc -texinfo $$i >> pgp-api.texi && \
 		echo "ok"; \
 	done
 
diff --git a/lib/x509/Makefile.am b/lib/x509/Makefile.am
index f7d7a128a8..1bc9bd9bd0 100644
--- a/lib/x509/Makefile.am
+++ b/lib/x509/Makefile.am
@@ -40,7 +40,7 @@ x509-api.texi: $(libgnutls_x509_la_SOURCES)
 	@echo "" > x509-api.texi
 	@for i in $(libgnutls_x509_la_SOURCES); do \
 		echo -n "Creating documentation for file $$i... " && \
-		$(top_srcdir)/doc/scripts/gdoc -texinfo $$i >> x509-api.texi && \
+		$(srcdir)/../../doc/scripts/gdoc -texinfo $$i >> x509-api.texi && \
 		echo "ok"; \
 	done
 
diff --git a/libextra/Makefile.am b/libextra/Makefile.am
index 331ddafa31..d8441b4860 100644
--- a/libextra/Makefile.am
+++ b/libextra/Makefile.am
@@ -112,7 +112,7 @@ gnutls-extra-api.texi: gnutls_extra.c
 	@echo "" > $@
 	@for i in $<; do \
 		echo -n "Creating documentation for file $$i... " && \
-		$(top_srcdir)/doc/scripts/gdoc -texinfo $$i >> $@ && \
+		$(srcdir)/../doc/scripts/gdoc -texinfo $$i >> $@ && \
 		echo "ok"; \
 	done
 
@@ -120,7 +120,7 @@ ia-api.texi: gnutls_ia.c
 	@echo "" > $@
 	@for i in $<; do \
 		echo -n "Creating documentation for file $$i... " && \
-		$(top_srcdir)/doc/scripts/gdoc -texinfo $$i >> $@ && \
+		$(srcdir)/../doc/scripts/gdoc -texinfo $$i >> $@ && \
 		echo "ok"; \
 	done
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 1517d5e82e..bcc3cb939f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -59,7 +59,7 @@ gnutls_cli_debug_LDADD = ../lib/libgnutls.la ../gl/libgnu.la
 certtool_SOURCES = certtool.gaa certtool-gaa.h certtool-cfg.h	\
 	certtool-gaa.c certtool.c prime.c certtool-cfg.c
 certtool_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la \
-	../gl/libgnu.la @LTLIBREADLINE@
+	../gl/libgnu.la ../lib/gl/liblgnu.la @LTLIBREADLINE@
 if HAVE_LIBCFG
 certtool_LDADD += -lcfg+
 else