From e6b93ff477d7c789b786b059dcab1f66e5aae013 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 3 Jun 2013 15:02:51 +0200 Subject: Use database name in options and driver files (autotools part) --- m4/oracle.m4 | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'm4/oracle.m4') diff --git a/m4/oracle.m4 b/m4/oracle.m4 index 920e981..ba8b7d6 100644 --- a/m4/oracle.m4 +++ b/m4/oracle.m4 @@ -180,47 +180,47 @@ fi # AC_CONFIG_COMMANDS([oracle.options], [ - rm -f db.options - echo '#! /bin/sh' >db-driver + rm -f oracle.options + echo '#! /bin/sh' >oracle-driver - echo 'conn_str=' >>db-driver + echo 'conn_str=' >>oracle-driver if test x$oracle_user_set = xyes; then - echo "--user '$oracle_user'" >>db.options - echo 'conn_str="'"$oracle_user"'"' >>db-driver + echo "--user '$oracle_user'" >>oracle.options + echo 'conn_str="'"$oracle_user"'"' >>oracle-driver fi if test x$oracle_password_set = xyes; then - echo "--password '$oracle_password'" >>db.options - echo 'conn_str="$conn_str/'"$oracle_password"'"' >>db-driver + echo "--password '$oracle_password'" >>oracle.options + echo 'conn_str="$conn_str/'"$oracle_password"'"' >>oracle-driver fi if test x$oracle_host_set = xyes; then - echo "--host '$oracle_host'" >>db.options - echo 'conn_str="$conn_str@//'"$oracle_host"'"' >>db-driver + echo "--host '$oracle_host'" >>oracle.options + echo 'conn_str="$conn_str@//'"$oracle_host"'"' >>oracle-driver if test x$oracle_port_set = xyes; then - echo "--port '$oracle_port'" >>db.options - echo 'conn_str="$conn_str:'"$oracle_port"'"' >>db-driver + echo "--port '$oracle_port'" >>oracle.options + echo 'conn_str="$conn_str:'"$oracle_port"'"' >>oracle-driver fi fi if test x$oracle_service != x; then if test x$oracle_host_set = xno; then - echo 'conn_str="$conn_str@"' >>db-driver + echo 'conn_str="$conn_str@"' >>oracle-driver fi - echo "--service '$oracle_service'" >>db.options - echo 'conn_str="$conn_str/'"$oracle_service"'"' >>db-driver + echo "--service '$oracle_service'" >>oracle.options + echo 'conn_str="$conn_str/'"$oracle_service"'"' >>oracle-driver fi - echo 'if test x$[]1 != x; then' >>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 + echo 'if test x$[]1 != x; then' >>oracle-driver + echo " exec $oracle_client -L -S "'$conn_str @$[]1' >>oracle-driver + echo "else" >>oracle-driver + echo " exec $oracle_client -L -S "'$conn_str' >>oracle-driver + echo "fi" >>oracle-driver - chmod +x db-driver + chmod +x oracle-driver ], [ oracle_client="$oracle_client" -- cgit v1.1