xserver: Branch 'master'
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Sat Dec 15 14:03:55 PST 2007
configure.ac | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
New commits:
commit b4ef8885e1697b83a0dcc9f7fe79155f19241798
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date: Sat Dec 15 14:00:19 2007 -0800
Xquartz: Fixed launchd detection
diff --git a/configure.ac b/configure.ac
index 1d8aa60..86338e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1120,10 +1120,6 @@ XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS} ${LIBCRYPTO}"
AC_SUBST([XSERVER_LIBS])
AC_SUBST([XSERVER_SYS_LIBS])
-if test "x$HAVE_LAUNCHD" = xyes; then
- XSERVER_CFLAGS="$XSERVER_CFLAGS -DHAVE_LAUNCHD"
-fi
-
# 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
@@ -1772,17 +1768,19 @@ if test "x$LAUNCHD" = "xauto"; then
if test "x$XQUARTZ" = "xyes" ; then
LAUNCHD=yes
else
+ unset LAUNCHD
AC_CHECK_PROG(LAUNCHD, [launchd], [yes], [no])
fi
fi
-AC_MSG_RESULT([$DMX])
-AM_CONDITIONAL(DMX, [test "x$DMX" = xyes])
if test "x$LAUNCHD" = "xyes" ; then
AC_DEFINE(HAVE_LAUNCHD, 1, [launchd support available])
fi
AM_CONDITIONAL(LAUNCHD, [test "x$LAUNCHD" = "xyes"])
+AC_MSG_RESULT([$DMX])
+AM_CONDITIONAL(DMX, [test "x$DMX" = xyes])
+
dnl kdrive DDX
XEPHYR_LIBS=
More information about the xorg-commit
mailing list