[dpkg] 114/187: libcompat: Include getopt module when we need getopt_long

[Reiner Herrmann]

This is an automated email from the git hooks/post-receive script.

deki-guest pushed a commit to branch master
in repository dpkg.

commit 7d22e85e637ae71791870497d001ff10609b31d3
Author: Guillem Jover <guillem at debian.org>
Date:   Sat Aug 27 17:37:51 2016 +0200

    libcompat: Include getopt module when we need getopt_long
    
    The latter requires the local getopt implementation, so we need to
    include it even if the system provides a getopt implementation.
---
 debian/changelog       | 1 +
 lib/compat/Makefile.am | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 985e9c9..f1b7ef1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -58,6 +58,7 @@ dpkg (1.18.11) UNRELEASED; urgency=medium
       across systems, for example on AIX.
     - Add <sys/sysmacros.h> on AIX for major() and minor().
     - Add missing <errno.h> in libcompat.
+    - Include libcompat getopt module when we need getopt_long.
   * Perl modules:
     - Obsolete Source-Version substvar in Dpkg::Substvars by emitting errors.
     - Rework keyring hooks in Dpkg::Vendor. Deprecate the keyrings hook, and
diff --git a/lib/compat/Makefile.am b/lib/compat/Makefile.am
index 3cb1e0b..1d5840a 100644
--- a/lib/compat/Makefile.am
+++ b/lib/compat/Makefile.am
@@ -38,6 +38,10 @@ endif
 
 if !HAVE_GETOPT
 libcompat_la_SOURCES += getopt.c getopt.h
+else
+if !HAVE_GETOPT_LONG
+libcompat_la_SOURCES += getopt.c getopt.h
+endif
 endif
 
 if !HAVE_GETOPT_LONG

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git