Update upstream source from tag 'upstream/0.9.16'

[location/debian/libloc.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9fad1b97dc7e7a4fc45602c66117eb2adde70cc0..96e6b0e3cf4d35d10ae6475099e00843ffd017b9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ(2.60)
 AC_INIT([libloc],
-        [0.9.15],
+        [0.9.16],
         [location@lists.ipfire.org],
         [libloc],
         [https://location.ipfire.org/])
@@ -122,7 +122,7 @@ 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]
+       [], [with_database_path=/var/lib/location/database.db]
 )
 
 if test -z "${with_database_path}"; then
@@ -175,10 +175,18 @@ PKG_CHECK_MODULES([PYTHON], [python-${PYTHON_VERSION}])
 AC_PATH_PROG(PERL, perl, no)
 AC_SUBST(PERL)
 
-AX_PROG_PERL_MODULES(ExtUtils::MakeMaker,, AC_MSG_WARN(Need some Perl modules))
+AX_PROG_PERL_MODULES(Config ExtUtils::MakeMaker,, AC_MSG_WARN(Need some Perl modules))
 
 AC_ARG_ENABLE(perl, AS_HELP_STRING([--disable-perl], [do not build the perl modules]), [],[enable_perl=yes])
 AM_CONDITIONAL(ENABLE_PERL, test "$enable_perl" = "yes")
+AS_IF([test "$enable_perl" = "yes"],
+      [
+       PERL_MODPATH=$($PERL -MConfig -e 'print $Config{installvendorarch}')
+       PERL_MANPATH=$($PERL -MConfig -e 'print $Config{installvendorman3dir}')
+       AC_SUBST(PERL_MODPATH)
+       AC_SUBST(PERL_MANPATH)
+       ],
+)
 
 dnl Checking for libresolv
 case "${host}" in
@@ -223,5 +231,7 @@ AC_MSG_RESULT([
         systemd support:        ${have_systemd}
 
        Bindings:
-         perl:                 ${enable_perl}
+         Perl:                 ${enable_perl}
+         Perl module path:     ${PERL_MODPATH}
+         Perl manual path:     ${PERL_MANPATH}
 ])