configure: Make the default database path configurable

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/configure.ac b/configure.ac
index 521194fce242801029776647f593a7f38ef00547..c469cbc34bef3a159bd667d68a8096e4f4c0a3d4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -120,6 +120,19 @@ CC_CHECK_FLAGS_APPEND([my_LDFLAGS], [LDFLAGS], [-fno-semantic-interposition])
 
 # ------------------------------------------------------------------------------
 
+AC_ARG_WITH([database-path],
+       AS_HELP_STRING([--with-database-path], [The default database path]),
+       [], [with_database_path=/var/lib/${PACKAGE_NAME}/database.db]
+)
+
+if test -z "${with_database_path}"; then
+       AC_MSG_ERROR([The default database path is empty])
+fi
+
+AC_DEFINE_UNQUOTED([LIBLOC_DEFAULT_DATABASE_PATH], ["${with_database_path}"],
+       [The default path for the database])
+AC_SUBST([DEFAULT_DATABASE_PATH], [${with_database_path}])
+
 AC_ARG_WITH([systemd],
        AS_HELP_STRING([--with-systemd], [Enable systemd support.])
 )
@@ -205,6 +218,7 @@ AC_MSG_RESULT([
         cflags:                 ${CFLAGS}
         ldflags:                ${LDFLAGS}
 
+        database path:          ${with_database_path}
         debug:                  ${enable_debug}
         systemd support:        ${have_systemd}
 

diff --git a/src/python/locationmodule.c b/src/python/locationmodule.c
index 46d9f83417416e05f8b10012574c9eaa6ca3a620..45c7bd883c0188948bd87693107309a4dd8040ee 100644 (file)
--- a/src/python/locationmodule.c
+++ b/src/python/locationmodule.c
@@ -121,6 +121,10 @@ PyMODINIT_FUNC PyInit__location(void) {
        if (PyModule_AddStringConstant(m, "__version__", PACKAGE_VERSION))
                return NULL;
 
+       // Default Database Path
+       if (PyModule_AddStringConstant(m, "DATABASE_PATH", LIBLOC_DEFAULT_DATABASE_PATH))
+               return NULL;
+
        // AS
        if (PyType_Ready(&ASType) < 0)
                return NULL;

diff --git a/src/scripts/location.in b/src/scripts/location.in
index 25119a8d34f270aded65c5c533ef92d46bdc7023..be13156b2509ec24c3c5bef84a3dfcfca3feb2cb 100644 (file)
--- a/src/scripts/location.in
+++ b/src/scripts/location.in
@@ -59,7 +59,7 @@ class CLI(object):
 
                # database
                parser.add_argument("--database", "-d",
-                       default="@databasedir@/database.db", help=_("Path to database"),
+                       default=location.DATABASE_PATH, help=_("Path to database"),
                )
 
                # public key