[vlc-commits] contrib/nfs: add configuration option to disable utils compilation

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Thu Jan 14 15:55:50 2016 +0100| [395819c38eb30c754ee35970b2ad689f833a67b0] | committer: Felix Paul Kühne

contrib/nfs: add configuration option to disable utils compilation

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=395819c38eb30c754ee35970b2ad689f833a67b0
---

 contrib/src/nfs/nfs-no-utils.patch |   27 +++++++++++++++++++++++++++
 contrib/src/nfs/rules.mak          |    2 ++
 2 files changed, 29 insertions(+)

diff --git a/contrib/src/nfs/nfs-no-utils.patch b/contrib/src/nfs/nfs-no-utils.patch
new file mode 100644
index 0000000..470e87a
--- /dev/null
+++ b/contrib/src/nfs/nfs-no-utils.patch
@@ -0,0 +1,27 @@
+diff -ru nfs/Makefile.am nfs-fixed/Makefile.am
+--- nfs/Makefile.am	2015-08-02 19:18:25.000000000 +0200
++++ nfs-fixed/Makefile.am	2016-01-14 14:33:06.000000000 +0100
+@@ -1,4 +1,4 @@
+-SUBDIRS = doc mount nfs nlm nsm portmap rquota lib include utils . $(MAYBE_EXAMPLES)
++SUBDIRS = doc mount nfs nlm nsm portmap rquota lib include $(MAYBE_UTILS) . $(MAYBE_EXAMPLES)
+ ACLOCAL_AMFLAGS = -I m4
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+diff -ru nfs/configure.ac nfs-fixed/configure.ac
+--- nfs/configure.ac	2015-08-02 19:18:25.000000000 +0200
++++ nfs-fixed/configure.ac	2016-01-14 14:43:43.000000000 +0100
+@@ -24,6 +24,14 @@
+ # We always want 64 bit file offsets
+ CFLAGS="${CFLAGS} -D_FILE_OFFSET_BITS=64"
+ 
++#option: utils
++AC_ARG_ENABLE([utils],
++              [AC_HELP_STRING([--enable-utils],
++                              [Build util programs])],
++	      [MAYBE_UTILS=""],
++	      [MAYBE_UTILS="utils"])
++AC_SUBST(MAYBE_UTILS)
++
+ #option: examples
+ AC_ARG_ENABLE([examples],
+               [AC_HELP_STRING([--enable-examples],
diff --git a/contrib/src/nfs/rules.mak b/contrib/src/nfs/rules.mak
index 45a1954..fc96c84 100644
--- a/contrib/src/nfs/rules.mak
+++ b/contrib/src/nfs/rules.mak
@@ -17,6 +17,8 @@ $(TARBALLS)/libnfs-$(NFS_VERSION).tar.gz:
 nfs: libnfs-$(NFS_VERSION).tar.gz .sum-nfs
 	$(UNPACK)
 	mv libnfs-libnfs-$(NFS_VERSION) libnfs-$(NFS_VERSION)
+	$(APPLY) $(SRC)/nfs/nfs-no-utils.patch
+	$(UPDATE_AUTOCONFIG)
 	$(MOVE)
 
 .nfs: nfs