Be a little friendlier for mercurial checkouts.

This commit was SVN r17271.

config/ompi_configure_options.m4

@@ -10,7 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
 dnl                         University of Stuttgart.  All rights reserved.
 dnl Copyright (c) 2004-2005 The Regents of the University of California.
 dnl                         All rights reserved.
-dnl Copyright (c) 2006-2007 Cisco Systems, Inc.  All rights reserved.
+dnl Copyright (c) 2006-2008 Cisco Systems, Inc.  All rights reserved.
 dnl Copyright (c) 2007      Sun Microsystems, Inc.  All rights reserved.
 dnl $COPYRIGHT$
 dnl 
@@ -22,6 +22,15 @@ dnl
 AC_DEFUN([OMPI_CONFIGURE_OPTIONS],[
 ompi_show_subtitle "Configuration options"
 
+#
+# Is this a developer copy?
+#
+if test -d .svn -o -d .hg; then
+    OMPI_DEVEL=1
+else
+    OMPI_DEVEL=0
+fi
+
 #
 # Code coverage options
 #
@@ -78,7 +87,7 @@ else
     WANT_MEM_DEBUG=0
 fi
 #################### Early development override ####################
-if test "$WANT_MEM_DEBUG" = "0" -a -z "$enable_mem_debug" -a -d .svn; then
+if test "$WANT_MEM_DEBUG" = "0" -a -z "$enable_mem_debug" -a "$OMPI_DEVEL" = 1; then
     WANT_MEM_DEBUG=1
     echo "--> developer override: enable mem profiling by default"
 fi
@@ -102,7 +111,7 @@ else
     WANT_MEM_PROFILE=0
 fi
 #################### Early development override ####################
-if test "$WANT_MEM_PROFILE" = "0" -a -z "$enable_mem_profile" -a -d .svn; then
+if test "$WANT_MEM_PROFILE" = "0" -a -z "$enable_mem_profile" -a "$OMPI_DEVEL" = 1; then
     WANT_MEM_PROFILE=1
     echo "--> developer override: enable mem profiling by default"
 fi
@@ -126,7 +135,7 @@ else
     WANT_PICKY_COMPILER=0
 fi
 #################### Early development override ####################
-if test "$WANT_PICKY_COMPILER" = "0" -a -z "$enable_picky" -a -d .svn; then
+if test "$WANT_PICKY_COMPILER" = "0" -a -z "$enable_picky" -a "$OMPI_DEVEL" = 1; then
     WANT_PICKY_COMPILER=1
     echo "--> developer override: enable picky compiler by default"
 fi
@@ -148,7 +157,7 @@ else
     WANT_DEBUG=0
 fi
 #################### Early development override ####################
-if test "$WANT_DEBUG" = "0" -a -z "$enable_debug" -a -d .svn; then
+if test "$WANT_DEBUG" = "0" -a -z "$enable_debug" -a "$OMPI_DEVEL" = 1; then
     WANT_DEBUG=1
     echo "--> developer override: enable debugging code by default"
 fi

config/ompi_get_version.m4

@@ -10,6 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
 dnl                         University of Stuttgart.  All rights reserved.
 dnl Copyright (c) 2004-2005 The Regents of the University of California.
 dnl                         All rights reserved.
+dnl Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
 dnl $COPYRIGHT$
 dnl 
 dnl Additional copyrights may follow
@@ -74,12 +75,10 @@ m4_define([OMPI_GET_VERSION],[
                          [AC_MSG_CHECKING([for SVN version])])
                 if test -d "$srcdir/.svn" ; then
                     $2_SVN_R=r`svnversion "$srcdir"`
-                    # make sure svnversion worked
-                    if test $? -ne 0 ; then
-                        $2_SVN_R=svn`date '+%m%d%Y'` 
-                    fi
-                    svnversion_result="$$2_SVN_R"
-                else
+                elif test -d "$srcdir/.hg" ; then
+                    $2_SVN_R=hg`hg -v -R "$srcdir" tip | grep changeset | cut -d: -f3`
+                fi
+                if test "$2_SVN_R" = ""; then
                     $2_SVN_R=svn`date '+%m%d%Y'`
                 fi
                 m4_ifdef([AC_MSG_RESULT],