From aaf4c660e0882566a2855a634c39ffe6f8816ece Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 3 Jun 2013 15:02:51 +0200
Subject: Use database name in options and driver files (autotools part)

---
 m4/pgsql.m4 | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'm4/pgsql.m4')

diff --git a/m4/pgsql.m4 b/m4/pgsql.m4
index 0ee4a4c..bb3c26e 100644
--- a/m4/pgsql.m4
+++ b/m4/pgsql.m4
@@ -149,42 +149,42 @@ fi
 #
 AC_CONFIG_COMMANDS([pgsql.options],
  [
-   rm -f db.options
-   echo '#! /bin/sh' >db-driver
+   rm -f pgsql.options
+   echo '#! /bin/sh' >pgsql-driver
 
-   echo 'opt=' >>db-driver
+   echo 'opt=' >>pgsql-driver
 
    if test x$pgsql_user_set = xyes; then
-     echo "--username '$pgsql_user'" >>db.options
-     echo 'opt="$opt --username='"$pgsql_user"'"' >>db-driver
+     echo "--username '$pgsql_user'" >>pgsql.options
+     echo 'opt="$opt --username='"$pgsql_user"'"' >>pgsql-driver
    fi
 
    if test x$pgsql_db_set = xyes; then
-     echo "--dbname '$pgsql_db'" >>db.options
-     echo 'opt="$opt --dbname='"$pgsql_db"'"' >>db-driver
+     echo "--dbname '$pgsql_db'" >>pgsql.options
+     echo 'opt="$opt --dbname='"$pgsql_db"'"' >>pgsql-driver
    fi
 
    if test x$pgsql_host_set = xyes; then
-     echo "--host '$pgsql_host'" >>db.options
-     echo 'opt="$opt --host='"$pgsql_host"'"' >>db-driver
+     echo "--host '$pgsql_host'" >>pgsql.options
+     echo 'opt="$opt --host='"$pgsql_host"'"' >>pgsql-driver
    fi
 
    if test x$pgsql_port_set = xyes; then
-     echo "--port '$pgsql_port'" >>db.options
-     echo 'opt="$opt --port='"$pgsql_port"'"' >>db-driver
+     echo "--port '$pgsql_port'" >>pgsql.options
+     echo 'opt="$opt --port='"$pgsql_port"'"' >>pgsql-driver
    fi
 
-   echo 'opt="$opt --quiet"' >>db-driver
-   echo 'PGOPTIONS=--client-min-messages=warning' >>db-driver
-   echo 'export PGOPTIONS' >>db-driver
+   echo 'opt="$opt --quiet"' >>pgsql-driver
+   echo 'PGOPTIONS=--client-min-messages=warning' >>pgsql-driver
+   echo 'export PGOPTIONS' >>pgsql-driver
 
-   echo 'if test x$[]1 != x; then' >>db-driver
-   echo "  exec $pgsql_client "'$opt --set ON_ERROR_STOP=1 -f $[]1' >>db-driver
-   echo "else" >>db-driver
-   echo "  exec $pgsql_client "'$opt' >>db-driver
-   echo "fi" >>db-driver
+   echo 'if test x$[]1 != x; then' >>pgsql-driver
+   echo "  exec $pgsql_client "'$opt --set ON_ERROR_STOP=1 -f $[]1' >>pgsql-driver
+   echo "else" >>pgsql-driver
+   echo "  exec $pgsql_client "'$opt' >>pgsql-driver
+   echo "fi" >>pgsql-driver
 
-   chmod +x db-driver
+   chmod +x pgsql-driver
  ],
  [
   pgsql_client="$pgsql_client"
-- 
cgit v1.1