Fixes for RPM build

4 files changed, 9 insertions, 12 deletions

diff --git a/Build-tools/Do-rpm b/Build-tools/Do-rpm
index 138953ab188..046ba93a1dd 100755
--- a/Build-tools/Do-rpm
+++ b/Build-tools/Do-rpm
@@ -210,7 +210,7 @@ if [ $? != 0 ]; then
  tail $log
 fi 
 
-if [ ! x$local_build=x1 ]; then
+if [ x$local_build != x1 ]; then
 
  # Build perl RPM (we currently need to be root to do this and that is
  # not possible)
@@ -228,5 +228,3 @@ if [ ! x$local_build=x1 ]; then
  #scp $owner@$bmachine:$rpmdir/SRPMS/Perl*-*.rpm $bpath/NEW-RPMS
 fi 
 )  > $log 2>&1
-
-
diff --git a/acinclude.m4 b/acinclude.m4
index 5b216a06df5..0a767227ce4 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -690,7 +690,7 @@ fi
 
 AC_DEFUN(MYSQL_CHECK_VIO, [
   AC_ARG_WITH([vio],
-              [  --with-vio          Include the Virtual IO support],
+              [  --with-vio              Include the Virtual IO support],
               [vio="$withval"],
               [vio=no])
 
@@ -1054,9 +1054,9 @@ dnl ---------------------------------------------------------------------------
 AC_DEFUN([MYSQL_CHECK_INNODB], [
   AC_ARG_WITH([innodb],
               [\
-  --with-innodb         Use Innodb],
+  --without-innodb        Do not include the InnoDB table handler],
               [innodb="$withval"],
-              [innodb=no])
+              [innodb=yes])
 
   AC_MSG_CHECKING([for Innodb])
 
@@ -1132,7 +1132,7 @@ dnl ---------------------------------------------------------------------------
 AC_DEFUN([MYSQL_CHECK_GEMINI], [
   AC_ARG_WITH([gemini],
               [\
-  --with-gemini[=DIR] Use Gemini DB located in DIR],
+  --with-gemini[=DIR]     Use Gemini DB located in DIR],
               [gemini="$withval"],
               [gemini=no])
 
@@ -1251,7 +1251,7 @@ changequote([, ])dnl
 AC_DEFUN(AC_SYS_LARGEFILE,
   [AC_REQUIRE([AC_CANONICAL_HOST])
    AC_ARG_ENABLE(largefile,
-     [  --disable-largefile    Omit support for large files])
+     [  --disable-largefile     Omit support for large files])
    if test "$enable_largefile" != no; then
      AC_CHECK_TOOL(GETCONF, getconf)
      AC_SYS_LARGEFILE_FLAGS(CFLAGS)
diff --git a/configure.in b/configure.in
index df9c6bbec4d..8528ff0b9a3 100644
--- a/configure.in
+++ b/configure.in
@@ -699,7 +699,7 @@ int main()
   AC_MSG_RESULT($atom_ops)
 
   AC_ARG_WITH(pstack,
-    [  --with-pstack         Use the pstack backtrace library],
+    [  --with-pstack           Use the pstack backtrace library],
     [ USE_PSTACK=$withval ],
     [ USE_PSTACK=no ])
   pstack_libs=
@@ -1752,8 +1752,7 @@ AC_ARG_WITH(embedded-server,
 )
 
 AC_ARG_WITH(extra-tools,
-    [  --without-extra-tools        Skip building utilites in the tools \
-     directory.],
+    [  --without-extra-tools   Skip building utilites in the tools directory.],
     [with_tools=$withval],
     [with_tools=yes]
 )
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index f5ce41a1c70..287fa76fb42 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -219,7 +219,7 @@ automake
 BuildMySQL "--disable-shared" \
 	   "--with-mysqld-ldflags='-all-static'" \
 	   "--with-client-ldflags='-all-static'" \
-	   "--without-berkeley-db --without-innodb"
+	   "--without-berkeley-db --with-innodb"
 nm --numeric-sort sql/mysqld > sql/mysqld.sym
 
 %install -n mysql-%{mysql_version}