[Gmp-commit] /var/hg/gmp-5.0: 2 new changesets

[mercurial at gmplib.org]

details:   /var/hg/gmp-5.0/rev/1ace0116b8cd
changeset: 13466:1ace0116b8cd
user:      Torbjorn Granlund <tege at gmplib.org>
date:      Sun May 01 14:18:54 2011 +0200
description:
Don't touch M4 if already set in the environment.

details:   /var/hg/gmp-5.0/rev/a67fb988bbb2
changeset: 13467:a67fb988bbb2
user:      Torbjorn Granlund <tege at gmplib.org>
date:      Sun May 01 15:51:49 2011 +0200
description:
*** empty log message ***

diffstat:

 ChangeLog    |  7 +++++++
 configure.in |  5 ++++-
 2 files changed, 11 insertions(+), 1 deletions(-)

diffs (32 lines):

diff -r d85fe5b8a056 -r a67fb988bbb2 ChangeLog
--- a/ChangeLog	Sun May 01 13:59:51 2011 +0200
+++ b/ChangeLog	Sun May 01 15:51:49 2011 +0200
@@ -68,6 +68,13 @@
 	* mpn/x86_64/gcd_1.asm: Use m4_lshift to avoid << operator.
 	* mpn/x86/k7/gcd_1.asm: Likewise.
 
+2010-08-20  Niels Möller  <nisse at lysator.liu.se>
+
+	Suggested by Ozkan Sezer:
+	* configure.in: If $M4 is already set in the environment, don't
+	touch it. Fixed the case that no assembler files are used, and
+	GMP_PROG_M4 is omitted.
+
 2010-05-14  Torbjorn Granlund  <tege at gmplib.org>
 
 	* mpn/generic/redc_2.c: Use asm code just for GNU C.
diff -r d85fe5b8a056 -r a67fb988bbb2 configure.in
--- a/configure.in	Sun May 01 13:59:51 2011 +0200
+++ b/configure.in	Sun May 01 15:51:49 2011 +0200
@@ -3079,7 +3079,10 @@
   GMP_PROG_M4
   GMP_M4_M4WRAP_SPURIOUS
 else
-  M4=m4-not-needed
+  # In case the user has set M4 in the environment, don't touch it.
+  if test -z "$M4" ; then
+    M4=m4-not-needed
+  fi 
 fi
 
 # Only do the GMP_ASM checks if there's a .S or .asm wanting them.