From 1e8dc6079d4db1ceea3d91423724f71e62a1208f463b1137b50d48d221783eeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Tue, 13 Apr 2010 14:14:10 +0000
Subject: [PATCH] Merge real fix from Jeff Layton.

- autoconf: define CAPNG_LDADD even when it's not set.

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/cifs-utils?expand=0&rev=13
---
 ...e-CAPNG_LDADD-even-when-it-s-not-set.patch | 27 +++++++++++++++++++
 Makefile.am-wo_libcapng.diff                  | 18 -------------
 cifs-utils.changes                            |  5 ++++
 cifs-utils.spec                               |  2 +-
 4 files changed, 33 insertions(+), 19 deletions(-)
 create mode 100644 0001-autoconf-define-CAPNG_LDADD-even-when-it-s-not-set.patch
 delete mode 100644 Makefile.am-wo_libcapng.diff

diff --git a/0001-autoconf-define-CAPNG_LDADD-even-when-it-s-not-set.patch b/0001-autoconf-define-CAPNG_LDADD-even-when-it-s-not-set.patch
new file mode 100644
index 0000000..0c9973d
--- /dev/null
+++ b/0001-autoconf-define-CAPNG_LDADD-even-when-it-s-not-set.patch
@@ -0,0 +1,27 @@
+From ff93d3fdbd4f70066f5c7834efa2b85e645727e8 Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton@samba.org>
+Date: Tue, 13 Apr 2010 09:56:41 -0400
+Subject: [PATCH] autoconf: define CAPNG_LDADD even when it's not set
+
+...otherwise automake won't replace it in the generated Makefile.
+
+Signed-off-by: Jeff Layton <jlayton@samba.org>
+---
+ configure.ac |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c56a944..a46c22d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -121,6 +121,7 @@ AM_CONDITIONAL(CONFIG_CIFSUPCALL, [test "$enable_cifsupcall" != "no"])
+ LIBCAP_NG_PATH
+ 
+ if test "x$CAPNG_LDADD" = "x"; then
++	AC_SUBST(CAPNG_LDADD)
+ 	AC_LIBCAP
+ fi
+ AC_OUTPUT
+-- 
+1.6.6.1
+
diff --git a/Makefile.am-wo_libcapng.diff b/Makefile.am-wo_libcapng.diff
deleted file mode 100644
index 20fcc31..0000000
--- a/Makefile.am-wo_libcapng.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Lars Mueller <lmuelle at suse dot de>
-Subject: Make cifs-utils 4.3 build on systems without libcap-ng
-X-Hack-Rate: 100%
-X-Reported-Upstream: No
-
-Index: cifs-utils-4.3/Makefile.am
-===================================================================
---- cifs-utils-4.3.orig/Makefile.am
-+++ cifs-utils-4.3/Makefile.am
-@@ -4,7 +4,7 @@ ACLOCAL_AMFLAGS = -I aclocal
- root_sbindir = "/sbin"
- root_sbin_PROGRAMS = mount.cifs
- mount_cifs_SOURCES = mount.cifs.c mtab.c util.c
--mount_cifs_LDADD = @LIBCAP@ @CAPNG_LDADD@
-+mount_cifs_LDADD = @LIBCAP@
- 
- man_MANS = mount.cifs.8
- 
diff --git a/cifs-utils.changes b/cifs-utils.changes
index f904d38..401842b 100644
--- a/cifs-utils.changes
+++ b/cifs-utils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr 13 14:09:46 UTC 2010 - lmuelle@suse.de
+
+- autoconf: define CAPNG_LDADD even when it's not set.
+
 -------------------------------------------------------------------
 Fri Apr  9 13:35:41 UTC 2010 - lmuelle@suse.de
 
diff --git a/cifs-utils.spec b/cifs-utils.spec
index 979d0f6..cd4a752 100644
--- a/cifs-utils.spec
+++ b/cifs-utils.spec
@@ -28,7 +28,7 @@ Source:         %{name}-%{version}.tar.bz2
 Source1:        cifs.init
 Source2:        mkinitrd_scripts_boot-cifs.sh
 Source3:        mkinitrd_scripts_setup-cifs.sh
-Patch:          Makefile.am-wo_libcapng.diff
+Patch:          0001-autoconf-define-CAPNG_LDADD-even-when-it-s-not-set.patch
 %if 0%{?suse_version}
 PreReq:         insserv %{?fillup_prereq} mkinitrd
 %else