# HG changeset patch
# User cvs
# Date 1186989099 -7200
# Node ID 6a43545367ac2cf0e1c4619122f1473e92940bd2
# Parent  96295c945003c49b515ebdb6a96b7f2a4479940d
Import from CVS: tag r20-0test1

diff -r 96295c945003 -r 6a43545367ac configure
--- a/configure	Mon Aug 13 09:10:53 2007 +0200
+++ b/configure	Mon Aug 13 09:11:39 2007 +0200
@@ -1139,7 +1139,7 @@
       ;;
     esac
 
-    if [ $opsys = hpux10 ]; then
+    if test $opsys = hpux10 ; then
       NON_GNU_CC="cc -Ae"
       NON_GNU_CPP="cc -Ae -E"
     fi
@@ -1601,7 +1601,7 @@
 fi
 
 #### Choose a compiler.
-if test "x$CC" != x  ; then
+if test "x$CC" = x  ; then
   cc_specified=1
 fi
 
diff -r 96295c945003 -r 6a43545367ac configure.in
--- a/configure.in	Mon Aug 13 09:10:53 2007 +0200
+++ b/configure.in	Mon Aug 13 09:11:39 2007 +0200
@@ -1145,7 +1145,7 @@
       ;;
     esac
 
-    if [ $opsys = hpux10 ]; then
+    if test $opsys = hpux10 ; then
       NON_GNU_CC="cc -Ae"
       NON_GNU_CPP="cc -Ae -E"
     fi
@@ -1621,7 +1621,7 @@
 fi
 
 #### Choose a compiler.
-if test "x$CC" != x  ; then
+if test "x$CC" = x  ; then
   cc_specified=1
 fi
 
diff -r 96295c945003 -r 6a43545367ac lisp/version.el
--- a/lisp/version.el	Mon Aug 13 09:10:53 2007 +0200
+++ b/lisp/version.el	Mon Aug 13 09:11:39 2007 +0200
@@ -25,7 +25,7 @@
 (defconst emacs-version "20.0"
   "Version numbers of this version of Emacs.")
 
-(setq emacs-version (purecopy (concat emacs-version " XEmacs Lucid")))
+(setq emacs-version (purecopy (concat emacs-version " XEmacs Lucid (test1)")))
 
 (defconst emacs-major-version
   (progn (or (string-match "^[0-9]+" emacs-version)