xserver: Branch 'master'

[Matthieu Herrb]

 configure.ac                        |    3 +++
 hw/xfree86/utils/ioport/Makefile.am |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit c934366424b0d20e013c84e6b94b226b20e7baa2
Author: Matthieu Herrb <matthieu.herrb at laas.fr>
Date:   Sun Mar 2 19:27:53 2008 +0100

    use UTILS_SYS_LIBS to pass SYS_LIBS to utils/ioports correctly

diff --git a/configure.ac b/configure.ac
index ebbf877..6388e74 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1137,6 +1137,9 @@ XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS} ${LIBCRYPTO}"
 AC_SUBST([XSERVER_LIBS])
 AC_SUBST([XSERVER_SYS_LIBS])
 
+UTILS_SYS_LIBS="${SYS_LIBS}"
+AC_SUBST([UTILS_SYS_LIBS])
+
 # The Xorg binary needs to export symbols so that they can be used from modules
 # Some platforms require extra flags to do this.   gcc should set these flags
 # when -rdynamic is passed to it, other compilers/linkers may need to be added
diff --git a/hw/xfree86/utils/ioport/Makefile.am b/hw/xfree86/utils/ioport/Makefile.am
index 1839c9a..c1f9453 100644
--- a/hw/xfree86/utils/ioport/Makefile.am
+++ b/hw/xfree86/utils/ioport/Makefile.am
@@ -37,7 +37,7 @@ ioport_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
 ioport_LDADD = \
 	../../os-support/libxorgos.la \
 	../../dummylib/libdummy-nonserver.a \
-	${SYS_LIBS}
+	${UTILS_SYS_LIBS}
 
 
 ioport_SOURCES =	\