From 31a0507dfe9cb5a87e2a860bac25a8405788489c Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 16 Jan 2012 16:59:37 +0200
Subject: Misc fixes

---
 m4/libodb-oracle.m4 | 2 +-
 m4/oracle.m4        | 2 +-
 mysql-driver.bat    | 2 +-
 oracle-driver.bat   | 2 +-
 pgsql-driver.bat    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/m4/libodb-oracle.m4 b/m4/libodb-oracle.m4
index 319377f..8c3d38a 100644
--- a/m4/libodb-oracle.m4
+++ b/m4/libodb-oracle.m4
@@ -64,7 +64,7 @@ main ()
 }
 ]]),
 [libodb_oracle_found=yes])
-libodb_oracle_found=yes
+
 if test x"$libodb_oracle_found" = xno; then
   LIBS="$save_LIBS"
 
diff --git a/m4/oracle.m4 b/m4/oracle.m4
index 80e3600..ec3d235 100644
--- a/m4/oracle.m4
+++ b/m4/oracle.m4
@@ -93,7 +93,7 @@ elif test x$oracle_user = xodb_test; then
   AC_MSG_RESULT(['$oracle_password'])
 elif test x$oracle_user != x/; then
   AC_MSG_RESULT([none])
-  AC_MSG_ERROR([password not specfied; Oracle requires a password])
+  AC_MSG_ERROR([password not specified; Oracle requires a password (--with-oracle-password=PASS)])
 fi
 
 # Service name.
diff --git a/mysql-driver.bat b/mysql-driver.bat
index b11b1e6..c28c232 100644
--- a/mysql-driver.bat
+++ b/mysql-driver.bat
@@ -8,7 +8,7 @@ rem
 rem mysql-driver.bat sql-file
 rem
 rem Run the mysql client on the SQL file specified. Adjust the
-rem option below to match your MySQL setup.
+rem options below to match your MySQL setup.
 rem
 
 setlocal
diff --git a/oracle-driver.bat b/oracle-driver.bat
index 7f531ed..c8d500f 100644
--- a/oracle-driver.bat
+++ b/oracle-driver.bat
@@ -8,7 +8,7 @@ rem
 rem oracle-driver.bat sql-file
 rem
 rem Run the oracle client on the SQL file specified. Adjust the
-rem option below to match your Oracle setup.
+rem options below to match your Oracle setup.
 rem
 
 setlocal
diff --git a/pgsql-driver.bat b/pgsql-driver.bat
index 338d00d..9d9551a 100644
--- a/pgsql-driver.bat
+++ b/pgsql-driver.bat
@@ -8,7 +8,7 @@ rem
 rem pgsql-driver.bat sql-file
 rem
 rem Run the pgsql client on the SQL file specified. Adjust the
-rem option below to match your PostgreSQL setup.
+rem options below to match your PostgreSQL setup.
 rem
 
 setlocal
-- 
cgit v1.1