diff options
| author | Constantin Michael <constantin@codesynthesis.com> | 2011-11-25 15:25:02 +0200 |
|---|---|---|
| committer | Constantin Michael <constantin@codesynthesis.com> | 2011-11-25 15:25:02 +0200 |
| commit | 40ed92d7a5d0d2ea499ce04aca4b6cd6ddca878d (patch) | |
| tree | 971c39f3452cc2266b82704361a936683144c733 /m4 | |
| parent | aefb392d4d6bcb59c3f3df34018d754ac4f718e9 (diff) | |
Corrections to Oracle user configuration script
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/oracle.m4 | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/m4/oracle.m4 b/m4/oracle.m4 index 836ded5..9e02c72 100644 --- a/m4/oracle.m4 +++ b/m4/oracle.m4 @@ -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])], + [AC_HELP_STRING([--with-oracle-password=login], [Oracle database password (odb_test by default)])], [case $withval in yes) oracle_password= @@ -87,15 +87,13 @@ AC_ARG_WITH( if test x$oracle_password_set = xyes; then AC_MSG_RESULT(['$oracle_password']) -# Use obd_test as a default password if the user is odb_test and the password -# option was not specified. -# elif test x$oracle_user = xodb_test; then oracle_password=odb_test oracle_password_set=yes AC_MSG_RESULT(['$oracle_password']) -else +elif test x$oracle_user != x/; then AC_MSG_RESULT([none]) + AC_MSG_ERROR([password not specfied; Oracle requires a password]) fi # Service name. @@ -103,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 in the database associated with the test 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= @@ -160,7 +158,7 @@ AC_ARG_WITH( [AC_HELP_STRING([--with-oracle-port=port], [Oracle database port (standard Oracle port by default)])], [case $withval in yes) - oracle_port= + oracle_port=0 oracle_port_set=yes ;; no) @@ -216,7 +214,7 @@ AC_CONFIG_COMMANDS([oracle.options], fi echo 'if test x$[]1 != x; then' >>db-driver - echo " exec $oracle_client -L -S "'$conn_str <$[]1' >>db-driver + echo " exec $oracle_client -L -S "'$conn_str @$[]1' >>db-driver echo "else" >>db-driver echo " exec $oracle_client -L -S "'$conn_str' >>db-driver echo "fi" >>db-driver |