aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog4
-rw-r--r--nxcomp/configure.in15
-rw-r--r--nxcompext/configure.in15
-rw-r--r--nxcompshad/configure.in15
-rw-r--r--nxproxy/configure.in15
5 files changed, 6 insertions, 58 deletions
diff --git a/debian/changelog b/debian/changelog
index 3b4175f92..664717898 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,8 @@ nx-libs (2:3.5.99.0-0~build1) UNRELEASED; urgency=medium
nx-libs (2:3.5.0.31-0x2go1) UNRELEASED; urgency=low
- [ X2Go Release Manager ]
- * Continue development
+ [ Clemens Lang ]
+ * Use path discovery for finding makedepend. Remove old cruft.
-- X2Go Release Manager <git-admin@x2go.org> Sun, 15 Mar 2015 00:48:06 +0100
diff --git a/nxcomp/configure.in b/nxcomp/configure.in
index 6fa9757a7..2378a9398 100644
--- a/nxcomp/configure.in
+++ b/nxcomp/configure.in
@@ -362,20 +362,7 @@ fi
dnl Find makedepend somewhere.
AC_SUBST(MAKEDEPEND)
-
-if test -x "../nx-X11/config/makedepend/makedepend" ; then
- MAKEDEPEND=../nx-X11/config/makedepend/makedepend
-else
- if test -x "/usr/X11R6/bin/makedepend" ; then
- MAKEDEPEND=/usr/X11R6/bin/makedepend
- else
- if test -x "/usr/openwin/bin/makedepend" ; then
- MAKEDEPEND=/usr/openwin/bin/makedepend
- else
- MAKEDEPEND=/usr/bin/makedepend
- fi
- fi
-fi
+MAKEDEPEND="$(which makedepend)"
dnl Determine what to build based on the platform.
dnl Override the LIBS settings on Cygwin32 so that
diff --git a/nxcompext/configure.in b/nxcompext/configure.in
index 08c48a751..6159e84c1 100644
--- a/nxcompext/configure.in
+++ b/nxcompext/configure.in
@@ -219,20 +219,7 @@ CFLAGS="$CFLAGS -DVERSION=\\\"${VERSION}\\\""
dnl Find makedepend somewhere.
AC_SUBST(MAKEDEPEND)
-
-if test -x "../nx-X11/config/makedepend/makedepend" ; then
- MAKEDEPEND=../nx-X11/config/makedepend/makedepend
-else
- if test -x "/usr/X11R6/bin/makedepend" ; then
- MAKEDEPEND=/usr/X11R6/bin/makedepend
- else
- if test -x "/usr/openwin/bin/makedepend" ; then
- MAKEDEPEND=/usr/openwin/bin/makedepend
- else
- MAKEDEPEND=/usr/bin/makedepend
- fi
- fi
-fi
+MAKEDEPEND="$(which makedepend)"
dnl Determine what to build based on the platform.
dnl Override the LIBS settings on Cygwin32 so that
diff --git a/nxcompshad/configure.in b/nxcompshad/configure.in
index 13149b3a0..a76c6b9a1 100644
--- a/nxcompshad/configure.in
+++ b/nxcompshad/configure.in
@@ -269,19 +269,6 @@ fi
dnl Find makedepend somewhere.
AC_SUBST(MAKEDEPEND)
-
-if test -x "../nx-X11/config/makedepend/makedepend" ; then
- MAKEDEPEND=../nx-X11/config/makedepend/makedepend
-else
- if test -x "/usr/X11R6/bin/makedepend" ; then
- MAKEDEPEND=/usr/X11R6/bin/makedepend
- else
- if test -x "/usr/openwin/bin/makedepend" ; then
- MAKEDEPEND=/usr/openwin/bin/makedepend
- else
- MAKEDEPEND=makedepend
- fi
- fi
-fi
+MAKEDEPEND="$(which makedepend)"
AC_OUTPUT(Makefile)
diff --git a/nxproxy/configure.in b/nxproxy/configure.in
index b86828d02..914e70738 100644
--- a/nxproxy/configure.in
+++ b/nxproxy/configure.in
@@ -167,19 +167,6 @@ fi
dnl Find makedepend somewhere.
AC_SUBST(MAKEDEPEND)
-
-if test -x "../nx-X11/config/makedepend/makedepend" ; then
- MAKEDEPEND=../nx-X11/config/makedepend/makedepend
-else
- if test -x "/usr/X11R6/bin/makedepend" ; then
- MAKEDEPEND=/usr/X11R6/bin/makedepend
- else
- if test -x "/usr/openwin/bin/makedepend" ; then
- MAKEDEPEND=/usr/openwin/bin/makedepend
- else
- MAKEDEPEND=makedepend
- fi
- fi
-fi
+MAKEDEPEND="$(which makedepend)"
AC_OUTPUT(Makefile)