1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66
|
Description: Fix missing AC_PROG_SYSCONFTOOL macro on autoreconf
From: ondrej@sury.org
Soren Stoutner <soren@debian.org>
Last-Update: 2025-10-27
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,6 +4,8 @@
@SET_MAKE@
+ACLOCAL_AMFLAGS = -I m4
+
AUTOMAKE_OPTIONS=dist-bzip2
AM_CXXFLAGS=@COURIER_UNICODE_CXXFLAGS@
AM_DISTCHECK_CONFIGURE_FLAGS=--with-notice=unicode
--- a/configure.ac
+++ b/configure.ac
@@ -16,6 +16,7 @@ LT_INIT
AC_PROG_MAKE_SET
AC_PROG_CXX
+AC_CONFIG_MACRO_DIRS([m4])
AX_CXX_COMPILE_STDCXX_17
AC_PROG_SYSCONFTOOL
AC_PATH_PROGS(SETENV, env)
--- /dev/null
+++ b/m4/sysconftool.m4
@@ -0,0 +1,37 @@
+# Configure sysconftool
+# Copyright 2000-2005 Double Precision, Inc. See COPYING for
+# distribution information.
+#
+# AC_PROG_SYSCONFTOOL
+
+AC_DEFUN([AC_PROG_SYSCONFTOOL],
+[
+
+ AC_PATH_PROGS(SYSCONFTOOL_PERL, perl5 perl, perl)
+
+ if test "$SYSCONFTOOL_PERL" = "perl"
+ then
+ AC_ERROR(perl not found - please install perl)
+ fi
+
+ AC_MSG_CHECKING(for sysconftool...)
+ SYSCONFTOOL=""
+ for sysconf_dir in $ac_aux_dir . .. ../..
+ do
+ if test -f $srcdir/$sysconf_dir/sysconftool
+ then
+ SYSCONFTOOL=$srcdir/$sysconf_dir/sysconftool
+ break
+ fi
+ done
+
+ if test "$SYSCONFTOOL" = ""
+ then
+ AC_ERROR(sysconftool missing - not in the package)
+ fi
+
+ AC_MSG_RESULT( $SYSCONFTOOL)
+ SYSCONFTOOL="$SYSCONFTOOL_PERL $SYSCONFTOOL"
+ AC_SUBST(SYSCONFTOOL)
+]
+)
|