summaryrefslogtreecommitdiffstats
path: root/m4
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-15 18:40:37 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-15 18:40:37 +0000
commitcabd780cae125bed23f70d57db05ae0f32d8df4c (patch)
treeaa0333438759b0295022ef95bd38df6b7226a89c /m4
parentReleasing progress-linux version 1.22.4-0.0~progress7.99u1. (diff)
downloaddpkg-cabd780cae125bed23f70d57db05ae0f32d8df4c.tar.xz
dpkg-cabd780cae125bed23f70d57db05ae0f32d8df4c.zip
Merging upstream version 1.22.5.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'm4')
-rw-r--r--m4/dpkg-build.m41
-rw-r--r--m4/dpkg-progs.m42
2 files changed, 2 insertions, 1 deletions
diff --git a/m4/dpkg-build.m4 b/m4/dpkg-build.m4
index 860d0d4..74897f5 100644
--- a/m4/dpkg-build.m4
+++ b/m4/dpkg-build.m4
@@ -7,7 +7,6 @@ AC_DEFUN([DPKG_BUILD_SHARED_LIBS], [
AS_IF([test "$enable_shared" = "yes" && test -z "$AUTHOR_TESTING"], [
AC_MSG_ERROR([building libdpkg as a shared library is not supported])
])
- AM_CONDITIONAL([BUILD_SHARED], [test "$enable_shared" = "yes"])
])# DPKG_BUILD_SHARED_LIBS
# DPKG_BUILD_RELEASE_DATE()
diff --git a/m4/dpkg-progs.m4 b/m4/dpkg-progs.m4
index c4af8db..cd18ba1 100644
--- a/m4/dpkg-progs.m4
+++ b/m4/dpkg-progs.m4
@@ -79,6 +79,8 @@ AC_DEFUN([DPKG_PROG_PERL], [
$r =~ s/$Config{vendorprefixexp}/\$(prefix)/;
print $r')
])
+ DPKG_WITH_DIR([perllibdir], [${PERL_LIBDIR}],
+ [perl modules directory])
])# DPKG_PROG_PERL
# DPKG_PROG_PO4A