See ChangeLog: Fri Mar 17 17:50:25 CET 2000 Werner Koch

6 files changed, 32 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 1d0bbfce1..32da65f7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Mar 17 17:50:25 CET 2000  Werner Koch  <[email protected]>
+
+	* acinclude.m4 (GNUPG_CHECK_MLOCK): Do librt check only when
+	we can't link a test progra,.  This way GNU systems don't need
+	to link against linrt.
+	(GNUPG_CHECK_IPC): Fixed use of TRY_COMPILE macro.  From Tim Mooney.
+
 2000-03-14 12:07:54  Werner Koch  ([email protected])
 
 	* acinclude.m4 (GNUPG_SYS_SYMBOL_UNDERSCORE): Add support for
diff --git a/NOTES b/NOTES
index 004cfa432..595f74b04 100644
--- a/NOTES
+++ b/NOTES
@@ -14,3 +14,5 @@ Some other reported cpu-vendor-os strings:
 gpg 1.0.1 okay with MP-RAS 3.02.01 Edition 5 using gcc 2.95.2 and EGD
  By <[email protected]>
 
+gpg 1.0.1 okay with 4.0.1 BSDI BSD/OS 4.0 i386
+
diff --git a/THANKS b/THANKS
index d210ab850..0fd8b2d6f 100644
--- a/THANKS
+++ b/THANKS
@@ -3,6 +3,7 @@ reporting problems, suggesting various improvements or submitting actual
 code.  Here is a list of those people.	Help me keep it complete and free of
 errors.
 
+Adam Mitchell		   [email protected]
 Alec Habig		   [email protected]
 Allan Clark		   [email protected]
 Anand Kumria		   [email protected]
@@ -112,6 +113,7 @@ Steven Bakker		   [email protected]
 Susanne Schultz 	   [email protected]
 Thiago Jung Bauermann	   [email protected]
 Thomas Roessler 	   [email protected]
+Tim Mooney		   [email protected]
 Tom Spindler		   [email protected]
 Tom Zerucha		   [email protected]
 Tomas Fasth		   [email protected]
diff --git a/acinclude.m4 b/acinclude.m4
index 2b3aa587a..35e3e4488 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -293,7 +293,8 @@ define(GNUPG_CHECK_IPC,
           AC_TRY_COMPILE([#include <sys/types.h>
              #include <sys/ipc.h>
              #include <sys/shm.h>],[
-             int foo( int shm_id ) {  shmctl(shm_id, SHM_LOCK, 0); }
+             int shm_id;
+             shmctl(shm_id, SHM_LOCK, 0);
              ],
              gnupg_cv_ipc_have_shm_lock="yes",
              gnupg_cv_ipc_have_shm_lock="no"
@@ -318,8 +319,14 @@ dnl GNUPG_CHECK_MLOCK
 dnl
 define(GNUPG_CHECK_MLOCK,
   [ AC_CHECK_FUNCS(mlock)
-    AC_CHECK_LIB(rt, mlock)
     if test "$ac_cv_func_mlock" = "yes"; then
+        AC_TRY_LINK_FUNC(mlock,tmp=yes,tmp=no)
+        if test $tmp = no; then
+            # We could not link a test program, so check whether
+            # we can do it by linking against librt
+            # this adds librt to the path. This adds librt to LIBS.
+            AC_CHECK_LIB(rt, mlock)
+        fi
         AC_MSG_CHECKING(whether mlock is broken)
           AC_CACHE_VAL(gnupg_cv_have_broken_mlock,
              AC_TRY_RUN([
diff --git a/mpi/ChangeLog b/mpi/ChangeLog
index e199f316d..26ca24e8f 100644
--- a/mpi/ChangeLog
+++ b/mpi/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar 17 17:50:25 CET 2000  Werner Koch  <[email protected]>
+
+	* config.links (sparc64-unknown-linux-gnu): use udic module.
+	From Adam Mitchell.
+
 2000-03-14 12:03:56  Werner Koch  ([email protected])
 
 	* Makefile.am: Do not use .s and .S files but a temp names, so that
diff --git a/mpi/config.links b/mpi/config.links
index 96cfeba29..31a58c8d4 100644
--- a/mpi/config.links
+++ b/mpi/config.links
@@ -81,6 +81,13 @@ case "${target}" in
 	path="pa7100 hppa1.1 hppa"
 	mpi_extra_modules="udiv-qrnnd"
 	;;
+    sparc64-*-linux-gnu)
+	# An extra rule because we have an report for this one only.
+	# Should be compared against the next GMP version
+	echo '/* configured for sparc64-*-linux-gnu */' >>./mpi/asm-syntax.h
+	path="sparc32v8 sparc32"
+	mpi_extra_modules="udiv"
+	;;
     sparc9*-*-* | sparc64*-*-* | ultrasparc*-*-*)
 	echo '/* configured for sparc9 or higher */' >>./mpi/asm-syntax.h
 	path="sparc32v8 sparc32"