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 1e1f4fb717
)
This commit is contained in:
parent
225dddbaed
commit
77b688a730
16
configure.ac
16
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])
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user