Import Debian changes 0.66.4-9

[hcoop/debian/courier-authlib.git] / debian / patches / 0002-Rip-AC_PROG_SYSCONFTOOL-macro-to-m4-directory.patch

diff --git a/debian/patches/0002-Rip-AC_PROG_SYSCONFTOOL-macro-to-m4-directory.patch b/debian/patches/0002-Rip-AC_PROG_SYSCONFTOOL-macro-to-m4-directory.patch
new file mode 100644 (file)
index 0000000..af0dee7
--- /dev/null
+++ b/debian/patches/0002-Rip-AC_PROG_SYSCONFTOOL-macro-to-m4-directory.patch
@@ -0,0 +1,80 @@
+From: =?utf-8?q?Ond=C5=99ej_Sur=C3=BD?= <ondrej@sury.org>
+Date: Mon, 8 Feb 2016 15:09:24 +0100
+Subject: Rip AC_PROG_SYSCONFTOOL macro to m4/ directory
+
+---
+ Makefile.am       |  2 ++
+ configure.ac      |  2 ++
+ m4/sysconftool.m4 | 37 +++++++++++++++++++++++++++++++++++++
+ 3 files changed, 41 insertions(+)
+ create mode 100644 m4/sysconftool.m4
+
+diff --git a/Makefile.am b/Makefile.am
+index bfa3981..f39338a 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,6 +2,8 @@
+ # Copyright 1998 - 2009 Double Precision, Inc.  See COPYING for
+ # distribution information.
+ 
++ACLOCAL_AMFLAGS = -I m4
++
+ AUTOMAKE_OPTIONS=dist-bzip2
+ 
+ SUBDIRS=libs/gdbmobj libs/bdbobj libs/md5 libs/sha1 libs/libhmac libs/numlib libs/makedat userdb libs/rfc822 libs/random128 libs/liblock liblog
+diff --git a/configure.ac b/configure.ac
+index 54dbbc6..7450d5f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -9,6 +9,8 @@ AC_INIT([courier-authlib],[0.66.4],[courier-users@lists.sourceforge.net])
+ 
+ AC_CONFIG_SRCDIR([courierauth.h])
+ 
++AC_CONFIG_MACRO_DIR([m4])
++
+ AM_INIT_AUTOMAKE
+ AC_CONFIG_HEADERS([courier_auth_config.h])
+ >confdefs.h  # Kill PACKAGE_ macros
+diff --git a/m4/sysconftool.m4 b/m4/sysconftool.m4
+new file mode 100644
+index 0000000..5e21e7b
+--- /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)
++]
++)