diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-11-23 22:55:38 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-11-24 00:24:46 +0100 |
| commit | 0979f2855c81d144d4c7d814678a5b5b2d34155b (patch) | |
| tree | ced53cd8ef7b46f115fff103d095e37f7820ae44 /configure.ac | |
| parent | 92134489ab35f6d173cb6fb6f676c1b5d88f5556 (diff) | |
build-sys: drop TARGET_UBUNTU
TARGET_UBUNTU is effectively the same as TARGET_DEBIAN. Given the Ubuntu
is unlikely to use systemd anytime soon there's no point in keeping this
separate.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 393c7ce88e..d0003bb5bd 100644 --- a/configure.ac +++ b/configure.ac @@ -640,7 +640,7 @@ AM_CONDITIONAL(ENABLE_MANPAGES, [test "x$have_manpages" = "xyes"]) # ------------------------------------------------------------------------------ -AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux, mandriva, mageia, angstrom or other])) +AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, arch, gentoo, slackware, altlinux, mandriva, mageia, angstrom or other])) if test "z$with_distro" = "z"; then if test "$cross_compiling" = yes; then AC_MSG_WARN([Target distribution cannot be reliably detected when cross-compiling. You should specify it with --with-distro (see $0 --help for recognized distros)]) @@ -676,11 +676,6 @@ case $with_distro in AC_DEFINE(TARGET_DEBIAN, [], [Target is Debian]) M4_DEFINES=-DTARGET_DEBIAN=1 ;; - ubuntu) - SYSTEM_SYSVRCND_PATH=/etc - AC_DEFINE(TARGET_UBUNTU, [], [Target is Ubuntu]) - M4_DEFINES=-DTARGET_UBUNTU=1 - ;; arch) SYSTEM_SYSVINIT_PATH= SYSTEM_SYSVRCND_PATH= @@ -765,8 +760,6 @@ AC_ARG_WITH([tty-gid], AM_CONDITIONAL(TARGET_FEDORA, test x"$with_distro" = xfedora) AM_CONDITIONAL(TARGET_SUSE, test x"$with_distro" = xsuse) AM_CONDITIONAL(TARGET_DEBIAN, test x"$with_distro" = xdebian) -AM_CONDITIONAL(TARGET_UBUNTU, test x"$with_distro" = xubuntu) -AM_CONDITIONAL(TARGET_DEBIAN_OR_UBUNTU, test x"$with_distro" = xdebian -o x"$with_distro" = xubuntu) AM_CONDITIONAL(TARGET_ARCH, test x"$with_distro" = xarch) AM_CONDITIONAL(TARGET_GENTOO, test x"$with_distro" = xgentoo) AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware) |