[Gmp-commit] /home/hgfiles/gmp: Don't touch M4 if already set in the environm...

[mercurial at gmplib.org]

details:   /home/hgfiles/gmp/rev/d32fa7b198d3
changeset: 13662:d32fa7b198d3
user:      Niels M?ller <nisse at lysator.liu.se>
date:      Fri Aug 20 14:23:14 2010 +0200
description:
Don't touch M4 if already set in the environment.

diffstat:

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

diffs (29 lines):

diff -r 6575a842b0e3 -r d32fa7b198d3 ChangeLog
--- a/ChangeLog	Sun Aug 08 20:04:11 2010 +0200
+++ b/ChangeLog	Fri Aug 20 14:23:14 2010 +0200
@@ -1,3 +1,10 @@
+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-08-08  Torbjorn Granlund  <tege at gmplib.org>
 
 	* mpn/x86_64/fat/fat.c: Recognise many more processors.
diff -r 6575a842b0e3 -r d32fa7b198d3 configure.in
--- a/configure.in	Sun Aug 08 20:04:11 2010 +0200
+++ b/configure.in	Fri Aug 20 14:23:14 2010 +0200
@@ -3077,7 +3077,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.