[X2Go-Commits] [nx-libs] 01/03: nx{comp{, ext, shad}, proxy}: use path discovery for finding makedepend. Remove old cruft.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 5464a6dba5742a9f22ba18c9b307d4ee42394378
Author: Clemens Lang <cal at macports.org>
Date:   Sun Mar 15 17:22:38 2015 +0100

    nx{comp{,ext,shad},proxy}: use path discovery for finding makedepend. Remove old cruft.
---
 debian/changelog        |    4 ++--
 nxcomp/configure.in     |   15 +--------------
 nxcompext/configure.in  |   15 +--------------
 nxcompshad/configure.in |   15 +--------------
 nxproxy/configure.in    |   15 +--------------
 5 files changed, 6 insertions(+), 58 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3b4175f..6647178 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 at x2go.org>  Sun, 15 Mar 2015 00:48:06 +0100
 
diff --git a/nxcomp/configure.in b/nxcomp/configure.in
index 6fa9757..2378a93 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 08c48a7..6159e84 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 13149b3..a76c6b9 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 b86828d..914e707 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)

--
Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git