diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-03-16 03:29:16 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2015-03-16 03:29:16 +0100 |
| commit | d8de5928e1e7a0677ed2d38fa4d9f53a58514ebe (patch) | |
| tree | fcdefeeaa0b2484ea747a3d74891203a39689c05 /nxcompext | |
| parent | 638e31c2f33723123d35ce65db88071a1be5cdb0 (diff) | |
| download | nx-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 'nxcompext')
| -rw-r--r-- | nxcompext/Makefile.in | 4 | ||||
| -rw-r--r-- | nxcompext/configure.in | 10 |
2 files changed, 12 insertions, 2 deletions
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. |