Typo in botbuild detection

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4639 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/configure b/configure
index b823d7b..23090d5 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
 #! /bin/sh

-# From configure.ac Revision: 4603 .
+# From configure.ac Revision: 4637 .

 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for simgrid 3.3-cvs.
 #
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for simgrid 3.3-cvs.
 #


@@ -26000,8 +26000,8 @@ else
 fi
 
 
 fi
 
 

-if test -e .svn && test x$USE_MAINTAINER_MODE != xyes && test x$botbuild != yes ; then
-  echo "ERROR:"
+if test -e .svn && test x$USE_MAINTAINER_MODE != xyes && test x$botbuild != xyes ; then
+  echo "ERROR: $botbuild"

   echo "ERROR: You have to enable the maintainer mode to compile the SVN."
   echo "ERROR: For this, just call configure this way:"
   echo "ERROR:"
   echo "ERROR: You have to enable the maintainer mode to compile the SVN."
   echo "ERROR: For this, just call configure this way:"
   echo "ERROR:"


@@ -28676,9 +28676,17 @@ Configuration of package \`${PACKAGE}' (version ${VERSION}) on $gras_arch_name (
        LDFlags:         ${LDFLAGS}
 
        Context backend: ${with_context}
        LDFlags:         ${LDFLAGS}
 
        Context backend: ${with_context}

+       Compile Java:    ${use_java}
+
+       Maintainer mode: ${USE_MAINTAINER_MODE}
+

 "
 "

-if test -e .svn && test x$USE_MAINTAINER_MODE != xyes && test x$botbuild = yes ; then
-  echo "WARNING:"
+if test x$botbuild = xyes ; then
+  echo "         This is a bot build. Do not specify --enable-botbuild if you are not a bot."
+fi
+
+if test -e .svn && test x$USE_MAINTAINER_MODE != xyes && test x$botbuild = xyes ; then
+  echo "WARNING:  $botbuild"

   echo "WARNING: You are compiling the SVN in botbuild mode. If you are not a daemon, don't do so. "
   echo "WARNING: Remove the --enable-botbuild from your configure line, and add --enable-maintainer-mode instead."
   echo "WARNING:"
   echo "WARNING: You are compiling the SVN in botbuild mode. If you are not a daemon, don't do so. "
   echo "WARNING: Remove the --enable-botbuild from your configure line, and add --enable-maintainer-mode instead."
   echo "WARNING:"

diff --git a/configure.ac b/configure.ac
index 3532750..3b86716 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -343,8 +343,8 @@ AC_ARG_ENABLE(botbuild,
               botbuild=$enableval,botbuild=no)
 AM_CONDITIONAL(BOTBUILD_MODE,test x$botbuild != xno)
 
               botbuild=$enableval,botbuild=no)
 AM_CONDITIONAL(BOTBUILD_MODE,test x$botbuild != xno)
 

-if test -e .svn && test x$USE_MAINTAINER_MODE != xyes && test x$botbuild != yes ; then
-  echo "ERROR:"
+if test -e .svn && test x$USE_MAINTAINER_MODE != xyes && test x$botbuild != xyes ; then
+  echo "ERROR: "

   echo "ERROR: You have to enable the maintainer mode to compile the SVN."
   echo "ERROR: For this, just call configure this way:"
   echo "ERROR:"
   echo "ERROR: You have to enable the maintainer mode to compile the SVN."
   echo "ERROR: For this, just call configure this way:"
   echo "ERROR:"


@@ -560,9 +560,18 @@ Configuration of package \`${PACKAGE}' (version ${VERSION}) on $gras_arch_name (
        LDFlags:         ${LDFLAGS}
 
        Context backend: ${with_context}
        LDFlags:         ${LDFLAGS}
 
        Context backend: ${with_context}

+       Compile Java:    ${use_java}
+       
+       Maintainer mode: ${USE_MAINTAINER_MODE}
+

 "
 "

-if test -e .svn && test x$USE_MAINTAINER_MODE != xyes && test x$botbuild = yes ; then
-  echo "WARNING:"
+if test x$botbuild = xyes ; then
+  echo "        This is a bot build. Do not specify --enable-botbuild if you are not a bot."
+  echo
+fi
+
+if test -e .svn && test x$USE_MAINTAINER_MODE != xyes && test x$botbuild = xyes ; then
+  echo "WARNING: "

   echo "WARNING: You are compiling the SVN in botbuild mode. If you are not a daemon, don't do so. "
   echo "WARNING: Remove the --enable-botbuild from your configure line, and add --enable-maintainer-mode instead."
   echo "WARNING:"
   echo "WARNING: You are compiling the SVN in botbuild mode. If you are not a daemon, don't do so. "
   echo "WARNING: Remove the --enable-botbuild from your configure line, and add --enable-maintainer-mode instead."
   echo "WARNING:"