diff options
| author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-05-23 02:32:28 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-05-23 02:32:28 -0700 |
| commit | 77b688a73025238ed9fe286a2bae8f78da65fce3 (patch) | |
| tree | 5260ea7d4d2b3356482d5b027e897bcd610530b5 | |
| parent | 225dddbaeded4d64fcc104da538449e5c4dedd2d (diff) | |
XQuartz: Don't need launchd checking in configure.ac anymore since its functionality has been removed from libxtrans and into the mach startup code.
(cherry picked from commit 1e1f4fb717d2f3a3227be2a034d28d6a4f29b5d1)
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | include/dix-config.h.in | 3 |
2 files changed, 0 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac index 3cec454da..21a7cb776 100644 --- a/configure.ac +++ b/configure.ac @@ -493,7 +493,6 @@ AC_ARG_WITH(apple-applications-dir,AS_HELP_STRING([--with-apple-applications-dir [ APPLE_APPLICATIONS_DIR="${withval}" ], [ APPLE_APPLICATIONS_DIR="/Applications/Utilities" ]) AC_SUBST([APPLE_APPLICATIONS_DIR]) -AC_ARG_WITH(launchd, AS_HELP_STRING([--with-launchd], [Build with support for Apple's launchd (default: auto)]), [LAUNCHD=$withval], [LAUNCHD=auto]) AC_ARG_WITH(launchagents-dir,AS_HELP_STRING([--with-launchagents-dir=PATH], [Path to launchd's LaunchAgents directory (default: /Library/LaunchAgents)]), [ launchagentsdir="${withval}" ], [ launchagentsdir="/Library/LaunchAgents" ]) @@ -1686,21 +1685,6 @@ AM_CONDITIONAL(HAVE_XPLUGIN, [test "x$ac_cv_lib_Xplugin_xp_init" = xyes]) AM_CONDITIONAL(HAVE_AGL_FRAMEWORK, [test "x$xorg_cv_AGL_framework" = xyes]) AM_CONDITIONAL(XQUARTZ, [test "x$XQUARTZ" = xyes]) -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 - -if test "x$LAUNCHD" = "xyes" ; then - AC_DEFINE(HAVE_LAUNCHD, 1, [launchd support available]) -fi -AM_CONDITIONAL(LAUNCHD, [test "x$LAUNCHD" = "xyes"]) - - dnl DMX DDX AC_MSG_CHECKING([whether to build Xdmx DDX]) diff --git a/include/dix-config.h.in b/include/dix-config.h.in index 914ce4947..6b9b896f3 100644 --- a/include/dix-config.h.in +++ b/include/dix-config.h.in @@ -148,9 +148,6 @@ /* Define to 1 if you have version 2.2 (or newer) of the drm library */ #undef HAVE_LIBDRM_2_2 -/* Define to 1 if launchd is available. */ -#undef HAVE_LAUNCHD - /* Have Quartz */ #undef XQUARTZ |