Commit d8de5928 authored by Mihai Moldovan's avatar Mihai Moldovan

nx{comp{,ext,shad},proxy}: try really hard to find makedepend. Do not fail if it is not available.

parent 638e31c2
...@@ -271,7 +271,7 @@ depends: depend.status ...@@ -271,7 +271,7 @@ depends: depend.status
depend: depend.status depend: depend.status
depend.status: depend.status:
if [ -x $(MAKEDEPEND) ] ; then \ if [ -n "$(MAKEDEPEND)" ] && [ -x "$(MAKEDEPEND)" ] ; then \
$(MAKEDEPEND) $(CXXINCLUDES) $(CCINCLUDES) \ $(MAKEDEPEND) $(CXXINCLUDES) $(CCINCLUDES) \
$(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) \ $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) \
$(CXXSRC) 2>/dev/null; \ $(CXXSRC) 2>/dev/null; \
......
...@@ -364,6 +364,16 @@ dnl Find makedepend somewhere. ...@@ -364,6 +364,16 @@ dnl Find makedepend somewhere.
AC_SUBST(MAKEDEPEND) AC_SUBST(MAKEDEPEND)
MAKEDEPEND="$(which 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 Determine what to build based on the platform.
dnl Override the LIBS settings on Cygwin32 so that dnl Override the LIBS settings on Cygwin32 so that
dnl we always link with the exact set of libraries. dnl we always link with the exact set of libraries.
......
...@@ -152,7 +152,7 @@ depends: depend.status ...@@ -152,7 +152,7 @@ depends: depend.status
depend: depend.status depend: depend.status
depend.status: depend.status:
if [ -x $(MAKEDEPEND) ] ; then \ if [ -n "$(MAKEDEPEND)" ] && [ -x "$(MAKEDEPEND)" ] ; then \
$(MAKEDEPEND) $(CXXINCLUDES) $(CCINCLUDES) \ $(MAKEDEPEND) $(CXXINCLUDES) $(CCINCLUDES) \
$(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) \ $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) \
$(CXXSRC) 2>/dev/null; \ $(CXXSRC) 2>/dev/null; \
......
...@@ -221,6 +221,16 @@ dnl Find makedepend somewhere. ...@@ -221,6 +221,16 @@ dnl Find makedepend somewhere.
AC_SUBST(MAKEDEPEND) AC_SUBST(MAKEDEPEND)
MAKEDEPEND="$(which 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 Determine what to build based on the platform.
dnl Override the LIBS settings on Cygwin32 so that dnl Override the LIBS settings on Cygwin32 so that
dnl we always link with the exact set of libraries. dnl we always link with the exact set of libraries.
......
...@@ -187,7 +187,7 @@ depends: depend.status ...@@ -187,7 +187,7 @@ depends: depend.status
depend: depend.status depend: depend.status
depend.status: depend.status:
if [ -x $(MAKEDEPEND) ] ; then \ if [ -n "$(MAKEDEPEND)" ] && [ -x "$(MAKEDEPEND)" ] ; then \
$(MAKEDEPEND) $(CXXINCLUDES) $(CCINCLUDES) \ $(MAKEDEPEND) $(CXXINCLUDES) $(CCINCLUDES) \
$(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) $(CXXSRC) 2>/dev/null; \ $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) $(CXXSRC) 2>/dev/null; \
fi fi
......
...@@ -271,4 +271,14 @@ dnl Find makedepend somewhere. ...@@ -271,4 +271,14 @@ dnl Find makedepend somewhere.
AC_SUBST(MAKEDEPEND) AC_SUBST(MAKEDEPEND)
MAKEDEPEND="$(which 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) AC_OUTPUT(Makefile)
...@@ -80,7 +80,7 @@ depends: depend.status ...@@ -80,7 +80,7 @@ depends: depend.status
depend: depend.status depend: depend.status
depend.status: depend.status:
if [ -x $(MAKEDEPEND) ] ; then \ if [ -n "$(MAKEDEPEND)" ] && [ -x "$(MAKEDEPEND)" ] ; then \
$(MAKEDEPEND) $(CXXINCLUDES) $(CCINCLUDES) \ $(MAKEDEPEND) $(CXXINCLUDES) $(CCINCLUDES) \
$(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) $(CXXSRC) 2>/dev/null; \ $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) $(CXXSRC) 2>/dev/null; \
fi fi
......
...@@ -169,4 +169,14 @@ dnl Find makedepend somewhere. ...@@ -169,4 +169,14 @@ dnl Find makedepend somewhere.
AC_SUBST(MAKEDEPEND) AC_SUBST(MAKEDEPEND)
MAKEDEPEND="$(which 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) AC_OUTPUT(Makefile)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment