The branch, master has been updated via 9e17c0b2a658ed63d8227ce8ea5f42a78ce66093 (commit) from cb77771f143e7e21dbe68c672ce8c531b257aae8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9e17c0b2a658ed63d8227ce8ea5f42a78ce66093 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Oct 14 00:51:00 2011 +0200 Prefer /usr/include/nx/X11 headers from nx-X11. ----------------------------------------------------------------------- Summary of changes: configure.in | 5 +++++ debian/changelog | 4 ++++ 2 files changed, 9 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/configure.in b/configure.in index 19668a7..efe1dc2 100644 --- a/configure.in +++ b/configure.in @@ -20,6 +20,11 @@ if test -d "../nx-X11/include" ; then LDFLAGS="$LDFLAGS -L../nx-X11/exports/lib" fi +if test -d "/usr/include/nx/X11" ; then + CXXFLAGS="$CXXFLAGS -I/usr/include/nx/X11" + CFLAGS="$CFLAGS -I/usr/include/nx/X11" +fi + dnl Check for programs. AC_PROG_CXX diff --git a/debian/changelog b/debian/changelog index 8886a3b..e6c0648 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ nxcompext (1:3.5.0-1-0~x2go2) unstable; urgency=low + [ Mike Gabriel ] + * Prefer /usr/include/nx/X11 headers from nx-X11. + [ Reinhard Tartler ] * Build -dbg package. + * Build libxcompext against x11proto-nx-dev. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 04 Oct 2011 20:31:59 +0200 hooks/post-receive -- nxcompext.git (NX compext library) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nxcompext.git" (NX compext library).