From 5f6e467e44858c469657ac0c25cf7d4b46eddf69468610aa4e0c34da6b62b29b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Tue, 13 Apr 2010 15:01:11 +0000 Subject: [PATCH] Merge real real fix from Jeff Layton. - 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 --- ...e-CAPNG_LDADD-even-when-it-s-not-set.patch | 27 ------------ ...se-atfooat-constructs-in-Makefile.am.patch | 42 +++++++++++++++++++ cifs-utils.changes | 5 +++ cifs-utils.spec | 3 +- 4 files changed, 49 insertions(+), 28 deletions(-) delete mode 100644 0001-autoconf-define-CAPNG_LDADD-even-when-it-s-not-set.patch create mode 100644 0002-autoconf-don-not-use-atfooat-constructs-in-Makefile.am.patch 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 deleted file mode 100644 index 0c9973d..0000000 --- a/0001-autoconf-define-CAPNG_LDADD-even-when-it-s-not-set.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ff93d3fdbd4f70066f5c7834efa2b85e645727e8 Mon Sep 17 00:00:00 2001 -From: Jeff Layton -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 ---- - 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/0002-autoconf-don-not-use-atfooat-constructs-in-Makefile.am.patch b/0002-autoconf-don-not-use-atfooat-constructs-in-Makefile.am.patch new file mode 100644 index 0000000..72f9f05 --- /dev/null +++ b/0002-autoconf-don-not-use-atfooat-constructs-in-Makefile.am.patch @@ -0,0 +1,42 @@ +From: Jeff Layton +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 +Signed-off-by: Jeff Layton +--- + 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 + + + + diff --git a/cifs-utils.changes b/cifs-utils.changes index 401842b..cc42c52 100644 --- a/cifs-utils.changes +++ b/cifs-utils.changes @@ -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 diff --git a/cifs-utils.spec b/cifs-utils.spec index cd4a752..930773d 100644 --- a/cifs-utils.spec +++ b/cifs-utils.spec @@ -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