diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2012-03-01 12:29:05 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2012-03-01 12:29:05 +0200 |
| commit | 8994eaab313bdec57ba38032f8adf9e05cc6d166 (patch) | |
| tree | 7a4785e17d07e34b1b9e721486e71452a18b745e | |
| parent | 31d70f7c67d1ea0b920538d50001b8e26d013d28 (diff) | |
Use consistent default database name for SQLite
| -rwxr-xr-x | build/sqlite/configure | 7 | ||||
| -rw-r--r-- | m4/sqlite.m4 | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/build/sqlite/configure b/build/sqlite/configure index 71225ce..0111c94 100755 --- a/build/sqlite/configure +++ b/build/sqlite/configure @@ -10,12 +10,11 @@ $echo $echo "Please enter the SQLite database file name. Note that it WILL" -$echo "BE MODIFIED by the tests. If you do not specify a name, then a" -$echo "temporary on-disk database will be created. You can also specify" -$echo "':memory:' as a file name to use a temporary in-memory database." +$echo "BE MODIFIED by the tests. You can also specify ':memory:' as a" +$echo "file name to use a temporary in-memory database." $echo -db=`read_value` +db=`read_value "/tmp/odb-test.db"` opt=$dcf_root/db.options diff --git a/m4/sqlite.m4 b/m4/sqlite.m4 index 5de424a..318a873 100644 --- a/m4/sqlite.m4 +++ b/m4/sqlite.m4 @@ -11,10 +11,10 @@ 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 + sqlite_db=odb-test.db sqlite_db_set=yes ;; no) @@ -25,7 +25,7 @@ AC_ARG_WITH( sqlite_db_set=yes ;; esac], - [sqlite_db=odb_test.db + [sqlite_db=odb-test.db sqlite_db_set=yes]) if test x$sqlite_db_set = xyes; then |