aboutsummaryrefslogtreecommitdiff
path: root/nxcomp
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2015-03-16 03:29:16 +0100
committerMihai Moldovan <ionic@ionic.de>2015-03-16 03:29:16 +0100
commitd8de5928e1e7a0677ed2d38fa4d9f53a58514ebe (patch)
treefcdefeeaa0b2484ea747a3d74891203a39689c05 /nxcomp
parent638e31c2f33723123d35ce65db88071a1be5cdb0 (diff)
downloadnx-libs-d8de5928e1e7a0677ed2d38fa4d9f53a58514ebe.tar.gz
nx-libs-d8de5928e1e7a0677ed2d38fa4d9f53a58514ebe.tar.bz2
nx-libs-d8de5928e1e7a0677ed2d38fa4d9f53a58514ebe.zip
nx{comp{,ext,shad},proxy}: try really hard to find makedepend. Do not fail if it is not available.
Diffstat (limited to 'nxcomp')
-rw-r--r--nxcomp/Makefile.in4
-rw-r--r--nxcomp/configure.in10
2 files changed, 12 insertions, 2 deletions
diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in
index 2234474ec..e571b3c90 100644
--- a/nxcomp/Makefile.in
+++ b/nxcomp/Makefile.in
@@ -271,9 +271,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) \
+ $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) \
$(CXXSRC) 2>/dev/null; \
fi
touch depend.status
diff --git a/nxcomp/configure.in b/nxcomp/configure.in
index 07c88df77..43b51573a 100644
--- a/nxcomp/configure.in
+++ b/nxcomp/configure.in
@@ -364,6 +364,16 @@ 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
+
dnl Determine what to build based on the platform.
dnl Override the LIBS settings on Cygwin32 so that
dnl we always link with the exact set of libraries.