From d8de5928e1e7a0677ed2d38fa4d9f53a58514ebe Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Mon, 16 Mar 2015 03:29:16 +0100
Subject: nx{comp{,ext,shad},proxy}: try really hard to find makedepend. Do not
 fail if it is not available.

---
 nxproxy/Makefile.in  |  4 ++--
 nxproxy/configure.in | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'nxproxy')

diff --git a/nxproxy/Makefile.in b/nxproxy/Makefile.in
index c00df91dc..3a27cbd29 100644
--- a/nxproxy/Makefile.in
+++ b/nxproxy/Makefile.in
@@ -80,9 +80,9 @@ depends:	depend.status
 depend:		depend.status
 
 depend.status:	
-		if [ -x $(MAKEDEPEND) ] ; then \
+		if [ -n "$(MAKEDEPEND)" ] && [ -x "$(MAKEDEPEND)" ] ; then \
 			$(MAKEDEPEND) $(CXXINCLUDES) $(CCINCLUDES) \
-                        $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) $(CXXSRC) 2>/dev/null; \
+			$(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) $(CXXSRC) 2>/dev/null; \
 		fi
 		touch depend.status
 
diff --git a/nxproxy/configure.in b/nxproxy/configure.in
index 914e70738..268584216 100644
--- a/nxproxy/configure.in
+++ b/nxproxy/configure.in
@@ -169,4 +169,14 @@ dnl Find makedepend somewhere.
 AC_SUBST(MAKEDEPEND)
 MAKEDEPEND="$(which makedepend)"
 
+# Try to desperately find makedepend.
+# Set MAKEDEPEND to the shipped makedepend binary. This will not
+# exist in nx-libs-lite, though, in which case MAKEDEPEND
+# will stay empty.
+if test -z "${MAKEDEPEND}"; then
+  if test -x "../nx-X11/config/makedepend/makedepend"; then
+    MAKEDEPEND="../nx-X11/config/makedepend/makedepend"
+  fi
+fi
+
 AC_OUTPUT(Makefile)
-- 
cgit v1.2.3