Cosmetic automake changes

7 files changed, 29 insertions, 29 deletions

diff --git a/configure.ac b/configure.ac
index 532140d..a44248d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,6 +15,10 @@ LT_INIT([win32-dll])
 
 AC_CANONICAL_HOST
 
+# Check for diff.
+#
+DIFF_TOOL
+
 # Check for C++ compiler and use it to compile the tests.
 #
 AC_PROG_CXX
@@ -30,6 +34,10 @@ THREADS
 
 AM_CONDITIONAL([ODB_TESTS_THREADS], [test x$threads != xnone])
 
+# Check for the ODB compiler.
+#
+ODB_COMPILER([], [AC_MSG_ERROR([odb compiler is not found; consider setting ODB variable or using --with-odb=DIR])])
+
 # Check for the ODB libs.
 #
 LIBODB([], [AC_MSG_ERROR([libodb is not found; consider using --with-libodb=DIR])])
@@ -87,14 +95,6 @@ case $database in
     ;;
 esac
 
-# Check for the ODB compiler.
-#
-ODB_COMPILER([], [AC_MSG_ERROR([odb compiler is not found; consider setting ODB variable or using --with-odb=DIR])])
-
-# Check for diff.
-#
-DIFF_TOOL
-
 # Define LIBCOMMON_STATIC_LIB if we are build static library on certain
 # platforms.
 #
diff --git a/m4/database.m4 b/m4/database.m4
index 5f5a03e..a2d72eb 100644
--- a/m4/database.m4
+++ b/m4/database.m4
@@ -12,7 +12,7 @@ AC_MSG_CHECKING([for database to use])
 
 AC_ARG_WITH(
   [database],
-  [AC_HELP_STRING([--with-database=db],
+  [AC_HELP_STRING([--with-database=DB],
                   [database to use for tests; valid values are: 'mysql', 'sqlite', 'pgsql', and 'oracle'])],
   [case $withval in
      no | yes)
diff --git a/m4/mysql.m4 b/m4/mysql.m4
index a93efe6..c6bac0d 100644
--- a/m4/mysql.m4
+++ b/m4/mysql.m4
@@ -12,7 +12,7 @@ AC_DEFUN([MYSQL], [
 AC_MSG_CHECKING([for mysql client program])
 AC_ARG_WITH(
   [mysql-client],
-  [AC_HELP_STRING([--with-mysql-client=path], [MySQL client program path (mysql by default)])],
+  [AC_HELP_STRING([--with-mysql-client=PATH], [MySQL client program path (mysql by default)])],
   [case $withval in
      yes)
        mysql_client=mysql
@@ -41,7 +41,7 @@ fi
 AC_MSG_CHECKING([for mysql database user])
 AC_ARG_WITH(
   [mysql-user],
-  [AC_HELP_STRING([--with-mysql-user=login], [MySQL database user (odb_test by default)])],
+  [AC_HELP_STRING([--with-mysql-user=NAME], [MySQL database user (odb_test by default)])],
   [case $withval in
      yes)
        mysql_user=odb_test
@@ -69,7 +69,7 @@ fi
 AC_MSG_CHECKING([for mysql database password])
 AC_ARG_WITH(
   [mysql-password],
-  [AC_HELP_STRING([--with-mysql-password=login], [MySQL database password (no password by default)])],
+  [AC_HELP_STRING([--with-mysql-password=PASS], [MySQL database password (no password by default)])],
   [case $withval in
      yes)
        mysql_password=
@@ -96,7 +96,7 @@ fi
 AC_MSG_CHECKING([for mysql database name])
 AC_ARG_WITH(
   [mysql-db],
-  [AC_HELP_STRING([--with-mysql-db=name], [MySQL database name (odb_test by default). Note that all data in this database WILL BE LOST!])],
+  [AC_HELP_STRING([--with-mysql-db=NAME], [MySQL database name (odb_test by default). Note that all data in this database WILL BE LOST!])],
   [case $withval in
      yes)
        mysql_db=odb_test
@@ -124,7 +124,7 @@ fi
 AC_MSG_CHECKING([for mysql database host])
 AC_ARG_WITH(
   [mysql-host],
-  [AC_HELP_STRING([--with-mysql-host=host], [MySQL database host (localhost by default)])],
+  [AC_HELP_STRING([--with-mysql-host=HOST], [MySQL database host (localhost by default)])],
   [case $withval in
      yes)
        mysql_host=localhost
@@ -151,7 +151,7 @@ fi
 AC_MSG_CHECKING([for mysql database port])
 AC_ARG_WITH(
   [mysql-port],
-  [AC_HELP_STRING([--with-mysql-port=port], [MySQL database port (standard MySQL port by default)])],
+  [AC_HELP_STRING([--with-mysql-port=PORT], [MySQL database port (standard MySQL port by default)])],
   [case $withval in
      yes)
        mysql_port=0
@@ -178,7 +178,7 @@ fi
 AC_MSG_CHECKING([for mysql database socket])
 AC_ARG_WITH(
   [mysql-socket],
-  [AC_HELP_STRING([--with-mysql-socket=socket], [MySQL database socket (standard MySQL socket by default)])],
+  [AC_HELP_STRING([--with-mysql-socket=SOCKET], [MySQL database socket (standard MySQL socket by default)])],
   [case $withval in
      yes)
        mysql_socket=
diff --git a/m4/odb.m4 b/m4/odb.m4
index a9f03c0..e873645 100644
--- a/m4/odb.m4
+++ b/m4/odb.m4
@@ -14,7 +14,7 @@ AC_ARG_VAR([ODBCPPFLAGS],[ODB-specific C++ preprocessor flags])
 
 AC_ARG_WITH(
   [odb],
-  [AC_HELP_STRING([--with-odb=DIR],[location of odb build directory])],
+  [AC_HELP_STRING([--with-odb=DIR],[location of odb compiler build directory])],
   [odb_dir=${withval}],
   [odb_dir=])
 
diff --git a/m4/oracle.m4 b/m4/oracle.m4
index 24e2724..80e3600 100644
--- a/m4/oracle.m4
+++ b/m4/oracle.m4
@@ -12,7 +12,7 @@ AC_DEFUN([ORACLE], [
 AC_MSG_CHECKING([for oracle client program])
 AC_ARG_WITH(
   [oracle-client],
-  [AC_HELP_STRING([--with-oracle-client=path], [Oracle client program path (sqlplus by default)])],
+  [AC_HELP_STRING([--with-oracle-client=PATH], [Oracle client program path (sqlplus by default)])],
   [case $withval in
      yes)
        oracle_client=sqlplus
@@ -41,7 +41,7 @@ fi
 AC_MSG_CHECKING([for oracle database user])
 AC_ARG_WITH(
   [oracle-user],
-  [AC_HELP_STRING([--with-oracle-user=login], [Oracle database user (odb_test by default)])],
+  [AC_HELP_STRING([--with-oracle-user=NAME], [Oracle database user (odb_test by default)])],
   [case $withval in
      yes)
        oracle_user=odb_test
@@ -69,7 +69,7 @@ fi
 AC_MSG_CHECKING([for oracle database password])
 AC_ARG_WITH(
   [oracle-password],
-  [AC_HELP_STRING([--with-oracle-password=login], [Oracle database password (odb_test by default)])],
+  [AC_HELP_STRING([--with-oracle-password=PASS], [Oracle database password (odb_test by default)])],
   [case $withval in
      yes)
        oracle_password=odb_test
@@ -101,7 +101,7 @@ fi
 AC_MSG_CHECKING([for oracle service name])
 AC_ARG_WITH(
   [oracle-service],
-  [AC_HELP_STRING([--with-oracle-service=name], [Oracle service name (default service if left empty). Note that all data associated with this user on this service WILL BE LOST!])],
+  [AC_HELP_STRING([--with-oracle-service=NAME], [Oracle service name (default service if left empty). Note that all data associated with this user on this service WILL BE LOST!])],
   [case $withval in
      yes)
        oracle_service=
@@ -128,7 +128,7 @@ fi
 AC_MSG_CHECKING([for oracle database host])
 AC_ARG_WITH(
   [oracle-host],
-  [AC_HELP_STRING([--with-oracle-host=host], [Oracle database host (localhost by default)])],
+  [AC_HELP_STRING([--with-oracle-host=HOST], [Oracle database host (localhost by default)])],
   [case $withval in
      yes)
        oracle_host=localhost
@@ -155,7 +155,7 @@ fi
 AC_MSG_CHECKING([for oracle database port])
 AC_ARG_WITH(
   [oracle-port],
-  [AC_HELP_STRING([--with-oracle-port=port], [Oracle database port (standard Oracle port by default)])],
+  [AC_HELP_STRING([--with-oracle-port=PORT], [Oracle database port (standard Oracle port by default)])],
   [case $withval in
      yes)
        oracle_port=1521
diff --git a/m4/pgsql.m4 b/m4/pgsql.m4
index b38bf34..f894891 100644
--- a/m4/pgsql.m4
+++ b/m4/pgsql.m4
@@ -12,7 +12,7 @@ AC_DEFUN([PGSQL], [
 AC_MSG_CHECKING([for pgsql client program])
 AC_ARG_WITH(
   [pgsql-client],
-  [AC_HELP_STRING([--with-pgsql-client=path], [PostgreSQL client program path (psql by default)])],
+  [AC_HELP_STRING([--with-pgsql-client=PATH], [PostgreSQL client program path (psql by default)])],
   [case $withval in
      yes)
        pgsql_client=psql
@@ -41,7 +41,7 @@ fi
 AC_MSG_CHECKING([for pgsql database user])
 AC_ARG_WITH(
   [pgsql-user],
-  [AC_HELP_STRING([--with-pgsql-user=login], [PostgreSQL database user (odb_test by default). The user must be able to login without specifying a password.])],
+  [AC_HELP_STRING([--with-pgsql-user=NAME], [PostgreSQL database user (odb_test by default). The user must be able to login without specifying a password.])],
   [case $withval in
      yes)
        pgsql_user=odb_test
@@ -69,7 +69,7 @@ fi
 AC_MSG_CHECKING([for pgsql database name])
 AC_ARG_WITH(
   [pgsql-db],
-  [AC_HELP_STRING([--with-pgsql-db=name], [PostgreSQL database name (odb_test by default). Note that all data in this database WILL BE LOST!])],
+  [AC_HELP_STRING([--with-pgsql-db=NAME], [PostgreSQL database name (odb_test by default). Note that all data in this database WILL BE LOST!])],
   [case $withval in
      yes)
        pgsql_db=odb_test
@@ -97,7 +97,7 @@ fi
 AC_MSG_CHECKING([for pgsql database host])
 AC_ARG_WITH(
   [pgsql-host],
-  [AC_HELP_STRING([--with-pgsql-host=host], [PostgreSQL database host (localhost by default)])],
+  [AC_HELP_STRING([--with-pgsql-host=HOST], [PostgreSQL database host (localhost by default)])],
   [case $withval in
      yes)
        pgsql_host=
@@ -124,7 +124,7 @@ fi
 AC_MSG_CHECKING([for pgsql database port])
 AC_ARG_WITH(
   [pgsql-port],
-  [AC_HELP_STRING([--with-pgsql-port=port], [PostgreSQL database port (standard PostgreSQL port by default)])],
+  [AC_HELP_STRING([--with-pgsql-port=PORT], [PostgreSQL database port (standard PostgreSQL port by default)])],
   [case $withval in
      yes)
        pgsql_port=0
diff --git a/m4/sqlite.m4 b/m4/sqlite.m4
index de5503e..0a54bf6 100644
--- a/m4/sqlite.m4
+++ b/m4/sqlite.m4
@@ -12,7 +12,7 @@ AC_DEFUN([SQLITE], [
 AC_MSG_CHECKING([for sqlite database file])
 AC_ARG_WITH(
   [sqlite-db],
-  [AC_HELP_STRING([--with-sqlite-db=file], [SQLite database file (odb_test.db by default). Note that all data in this database WILL BE LOST!])],
+  [AC_HELP_STRING([--with-sqlite-db=FILE], [SQLite database file (odb_test.db by default). Note that all data in this database WILL BE LOST!])],
   [case $withval in
      yes)
        sqlite_db=odb_test.db