Some configuration changes

6 files changed, 34 insertions, 8 deletions

diff --git a/mpi/ChangeLog b/mpi/ChangeLog
index 64b0b3867..95bb6f1d2 100644
--- a/mpi/ChangeLog
+++ b/mpi/ChangeLog
@@ -1,3 +1,12 @@
+2000-11-14  Werner Koch  <[email protected]>
+
+	* mpi-internal.h, mpi.h: Changed the way they are called and
+	introduced DID_MPI_LIMP_TYPEDEF hack.  Very ugly, should all be
+	revamped.
+	
+	* Makefile.am (OMIT_DEPENDENCIES): Hack to work around dependency
+	problems.
+
 2000-10-11  Werner Koch  <[email protected]>
 
 	* generic/mpi-asm-defs.h: New.
diff --git a/mpi/Makefile.am b/mpi/Makefile.am
index f7567e5f2..a9df442e6 100644
--- a/mpi/Makefile.am
+++ b/mpi/Makefile.am
@@ -1,7 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-
-INCLUDES =  -I$(top_srcdir)/gcrypt
+INCLUDES =  -I$(top_srcdir)/gcrypt 
 CFLAGS = @CFLAGS@ @MPI_OPT_FLAGS@
 ASFLAGS = @MPI_SFLAGS@
 
@@ -12,6 +11,8 @@ DISTCLEANFILES = mpih-add1.S mpih-mul1.S mpih-mul2.S mpih-mul3.S  \
 # CLEANFILES = _*.s
 CLEANFILES = *.s
 
+OMIT_DEPENDENCIES = types.h gcrypt.h
+
 noinst_LTLIBRARIES = libmpi.la
 
 libmpi_la_LDFLAGS =
@@ -33,7 +34,8 @@ libmpi_la_SOURCES = longlong.h	   \
 	      mpih-cmp.c     \
 	      mpih-div.c     \
 	      mpih-mul.c     \
-	      mpiutil.c
+	      mpiutil.c      \
+              mpi.h
 
 # Note this objects are actually links, the sourcefiles are
 # distributed by special code in dist-hook
@@ -63,3 +65,4 @@ libmpi_la_LIBADD = $(common_asm_objects) @MPI_EXTRA_ASM_OBJS@
 #   $(COMPILE) -c _$*.s
 #   mv -f _$*.o $*.o
 
+
diff --git a/mpi/generic/mpi-asm-defs.h b/mpi/generic/mpi-asm-defs.h
index c25f966a9..3bd1b611f 100644
--- a/mpi/generic/mpi-asm-defs.h
+++ b/mpi/generic/mpi-asm-defs.h
@@ -1,8 +1,7 @@
 /* This file defines some basic constants for the MPI machinery.  We
  * need to define the types on a per-CPU basis, so it is done with
  * this file here.  */
-#define BYTES_PER_MPI_LIMB  (sizeof unsigned long)
-
+#define BYTES_PER_MPI_LIMB  (SIZEOF_UNSIGNED_LONG)
 
 
 
diff --git a/mpi/mpi-internal.h b/mpi/mpi-internal.h
index cde1c0ce2..3a7855de8 100644
--- a/mpi/mpi-internal.h
+++ b/mpi/mpi-internal.h
@@ -30,6 +30,24 @@
 #ifndef G10_MPI_INTERNAL_H
 #define G10_MPI_INTERNAL_H
 
+#include "mpi-asm-defs.h"
+#if BYTES_PER_MPI_LIMB == SIZEOF_UNSIGNED_INT
+  typedef unsigned int mpi_limb_t;
+  typedef   signed int mpi_limb_signed_t;
+#elif BYTES_PER_MPI_LIMB == SIZEOF_UNSIGNED_LONG
+  typedef unsigned long int mpi_limb_t;
+  typedef   signed long int mpi_limb_signed_t;
+#elif BYTES_PER_MPI_LIMB == SIZEOF_UNSIGNED_LONG_LONG
+  typedef unsigned long long int mpi_limb_t;
+  typedef   signed long long int mpi_limb_signed_t;
+#elif BYTES_PER_MPI_LIMB == SIZEOF_UNSIGNED_SHORT
+  typedef unsigned short int mpi_limb_t;
+  typedef   signed short int mpi_limb_signed_t;
+#else
+  #error BYTES_PER_MPI_LIMB does not match any C type
+#endif
+#define BITS_PER_MPI_LIMB    (8*BYTES_PER_MPI_LIMB)
+#define DID_MPI_LIMB_TYPEDEF 1
 #include "mpi.h"
 
 /* If KARATSUBA_THRESHOLD is not already defined, define it to a
diff --git a/mpi/mpicoder.c b/mpi/mpicoder.c
index 9c68d7c9b..87f5870c9 100644
--- a/mpi/mpicoder.c
+++ b/mpi/mpicoder.c
@@ -24,9 +24,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "mpi.h"
 #include "mpi-internal.h"
-#include "memory.h"
 #include "g10lib.h"
 
 #define MAX_EXTERN_MPI_BITS 16384
diff --git a/mpi/mpiutil.c b/mpi/mpiutil.c
index 2dad135d4..3c5aee057 100644
--- a/mpi/mpiutil.c
+++ b/mpi/mpiutil.c
@@ -25,7 +25,6 @@
 #include <assert.h>
 
 #include "g10lib.h"
-#include "mpi.h"
 #include "mpi-internal.h"
 #include "memory.h"