aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nxcomp/Makefile.in4
-rw-r--r--nxcomp/configure.in10
-rw-r--r--nxcompext/Makefile.in4
-rw-r--r--nxcompext/configure.in10
-rw-r--r--nxcompshad/Makefile.in4
-rw-r--r--nxcompshad/configure.in10
-rw-r--r--nxproxy/Makefile.in4
-rw-r--r--nxproxy/configure.in10
8 files changed, 48 insertions, 8 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.
diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in
index 8777ceeed..da464bd6d 100644
--- a/nxcompext/Makefile.in
+++ b/nxcompext/Makefile.in
@@ -152,9 +152,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/nxcompext/configure.in b/nxcompext/configure.in
index 6159e84c1..e6f13c0ea 100644
--- a/nxcompext/configure.in
+++ b/nxcompext/configure.in
@@ -221,6 +221,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.
diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in
index 2f6e50bf9..5ea286395 100644
--- a/nxcompshad/Makefile.in
+++ b/nxcompshad/Makefile.in
@@ -187,9 +187,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/nxcompshad/configure.in b/nxcompshad/configure.in
index 4e91361ff..8dd1b2e21 100644
--- a/nxcompshad/configure.in
+++ b/nxcompshad/configure.in
@@ -271,4 +271,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)
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)