Skip to content

N
nx-libs
Commit 5464a6db authored by Clemens Lang's avatar Clemens Lang Committed by Mihai Moldovan
Browse files
Options

nx{comp{,ext,shad},proxy}: use path discovery for finding makedepend. Remove old cruft.

parent c460e090
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 58 deletions
debian/changelog
View file @ 5464a6db
...@@ -12,8 +12,8 @@ nx-libs (2:3.5.99.0-0~build1) UNRELEASED; urgency=medium ...@@ -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 nx-libs (2:3.5.0.31-0x2go1) UNRELEASED; urgency=low
[ X2Go Release Manager ] [ Clemens Lang ]
* Continue development * Use path discovery for finding makedepend. Remove old cruft.
-- X2Go Release Manager <git-admin@x2go.org> Sun, 15 Mar 2015 00:48:06 +0100 -- X2Go Release Manager <git-admin@x2go.org> Sun, 15 Mar 2015 00:48:06 +0100
......
nxcomp/configure.in
View file @ 5464a6db
...@@ -362,20 +362,7 @@ fi ...@@ -362,20 +362,7 @@ fi
dnl Find makedepend somewhere. dnl Find makedepend somewhere.
AC_SUBST(MAKEDEPEND) AC_SUBST(MAKEDEPEND)
MAKEDEPEND="$(which 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
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
......
nxcompext/configure.in
View file @ 5464a6db
...@@ -219,20 +219,7 @@ CFLAGS="$CFLAGS -DVERSION=\\\"${VERSION}\\\"" ...@@ -219,20 +219,7 @@ CFLAGS="$CFLAGS -DVERSION=\\\"${VERSION}\\\""
dnl Find makedepend somewhere. dnl Find makedepend somewhere.
AC_SUBST(MAKEDEPEND) AC_SUBST(MAKEDEPEND)
MAKEDEPEND="$(which 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
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
......
nxcompshad/configure.in
View file @ 5464a6db
...@@ -269,19 +269,6 @@ fi ...@@ -269,19 +269,6 @@ fi
dnl Find makedepend somewhere. dnl Find makedepend somewhere.
AC_SUBST(MAKEDEPEND) AC_SUBST(MAKEDEPEND)
MAKEDEPEND="$(which 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
AC_OUTPUT(Makefile) AC_OUTPUT(Makefile)
nxproxy/configure.in
View file @ 5464a6db
...@@ -167,19 +167,6 @@ fi ...@@ -167,19 +167,6 @@ fi
dnl Find makedepend somewhere. dnl Find makedepend somewhere.
AC_SUBST(MAKEDEPEND) AC_SUBST(MAKEDEPEND)
MAKEDEPEND="$(which 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
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