diff options
| author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-05-28 12:01:35 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-05-28 12:01:35 -0700 |
| commit | 44e2ee01b456deb2630d21786d19ee2734d2f40a (patch) | |
| tree | 85275ee6c0d3c49857a222236834588114eedbbf | |
| parent | d315445cb85876cda56f46cb657167d4eb906ba0 (diff) | |
Apple: Don't use launchd on Tiger since it doesn't support the features we need.
https://bugs.freedesktop.org/show_bug.cgi?id=15893
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 17 |
2 files changed, 7 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index c778487..78ae154 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,10 +27,6 @@ bin_SCRIPTS = startx xinit_CFLAGS = $(XINIT_CFLAGS) -DXINITDIR=\"$(XINITDIR)\" -DBINDIR=\"$(bindir)\" xinit_LDADD = $(XINIT_LIBS) -if APPLE_LEOPARD -xinit_LDFLAGS = -framework CoreServices -endif - xinit_SOURCES = \ xinit.c diff --git a/configure.ac b/configure.ac index 42c3b60..6f6bf6c 100644 --- a/configure.ac +++ b/configure.ac @@ -102,22 +102,19 @@ AC_ARG_WITH(launchdaemons-dir, AS_HELP_STRING([--with-launchdaemons-dir=PATH], if test "x$LAUNCHD" = "xauto"; then unset LAUNCHD - AC_CHECK_PROG(LAUNCHD, [launchd], [yes], [no]) -fi - -if test "x$LAUNCHD" = "xyes" ; then - AC_DEFINE(HAVE_LAUNCHD, 1, [launchd support available]) - case $host_os in - darwin9*|darwin1*) - AM_CONDITIONAL(APPLE_LEOPARD, true) + darwin8*) + LAUNCHD=no ;; *) - AM_CONDITIONAL(APPLE_LEOPARD, false) + AC_CHECK_PROG(LAUNCHD, [launchd], [yes], [no]) ;; esac +fi + +if test "x$LAUNCHD" = "xyes" ; then + AC_DEFINE(HAVE_LAUNCHD, 1, [launchd support available]) else - AM_CONDITIONAL(APPLE_LEOPARD,false) launchagentsdir="" launchdaemonsdir="" fi |