pool/cifs-utils
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge real real fix from Jeff Layton.

Browse Source 
- automake: don't use @foo@ constructs in Makefile.am.

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/cifs-utils?expand=0&rev=14
This commit is contained in:
Lars Müller 2010-04-13 15:01:11 +00:00 committed by Git OBS Bridge
parent 1e8dc6079d
commit 5f6e467e44
4 changed files with 49 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
0001-autoconf-define-CAPNG_LDADD-even-when-it-s-not-set.patch
View File

@ -1,27 +0,0 @@
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

42
0002-autoconf-don-not-use-atfooat-constructs-in-Makefile.am.patch Normal file
View File

@ -0,0 +1,42 @@
From: Jeff Layton <jlayton@samba.org>
To: linux-cifs-client@lists.samba.org
Cc: sjayaraman@suse.de, lars@samba.org
Date: Tue, 13 Apr 2010 10:26:11 -0400
Subject: [PATCH] automake: don't use @foo@ constructs in Makefile.am
X-Mailer: git-send-email 1.6.6.1
...use $(foo) instead. That doesn't rely on an explicit AC_SUBST().
Reported-by: Lars Müller <lars@samba.org>
Signed-off-by: Jeff Layton <jlayton@samba.org>
---
Makefile.am | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 01f1762..1cf7d23 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,14 +4,14 @@ 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) $(CAPNG_LDADD)
man_MANS = mount.cifs.8
if CONFIG_CIFSUPCALL
sbin_PROGRAMS = cifs.upcall
cifs_upcall_SOURCES = cifs.upcall.c data_blob.c asn1.c spnego.c util.c
-cifs_upcall_LDADD = -ltalloc -lkeyutils @KRB5_LDADD@
+cifs_upcall_LDADD = -ltalloc -lkeyutils $(KRB5_LDADD)
man_MANS += cifs.upcall.8
endif
--
1.6.6.1

5
cifs-utils.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Apr 13 14:59:16 UTC 2010 - lmuelle@suse.de
- automake: don't use @foo@ constructs in Makefile.am.
-------------------------------------------------------------------
Tue Apr 13 14:09:46 UTC 2010 - lmuelle@suse.de

3
cifs-utils.spec
View File

@ -28,7 +28,8 @@ Source: %{name}-%{version}.tar.bz2
Source1: cifs.init
Source2: mkinitrd_scripts_boot-cifs.sh
Source3: mkinitrd_scripts_setup-cifs.sh
Patch: 0001-autoconf-define-CAPNG_LDADD-even-when-it-s-not-set.patch
#Patch: 0001-autoconf-define-CAPNG_LDADD-even-when-it-s-not-set.patch
Patch: 0002-autoconf-don-not-use-atfooat-constructs-in-Makefile.am.patch
%if 0%{?suse_version}
PreReq: insserv %{?fillup_prereq} mkinitrd
%else