~ubuntu-branches/debian/sid/upstart/sid

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Michael Biebl
  • Date: 2009-07-23 00:24:02 UTC
  • mfrom: (1.2.2 upstream)
  • mto: This revision was merged to the branch mainline in revision 19.
  • Revision ID: james.westby@ubuntu.com-20090723002402-pm5tq3kkipr18q00
Tags: 0.6.2-1
* New major upstream release. Closes: #530348
* Remove patches that have been merged upstream or are obsolete
  - debian/patches/01-limits.patch
  - debian/patches/02-telinit-u.patch
  - debian/patches/03-static-convenience-libs.patch
* Add Build-Depends on pkg-config (>= 0.22), libdbus-1-dev (>= 1.2.16) and
  libexpat1-dev (>= 2.0.0). D-Bus has replaced the home-grown IPC.
* Bump Standards-Version to 3.8.2. No further changes.
* debian/copyright
  - Update copyright years.
  - Clarify license text, Upstart is GPL-2 only.
  - Refer to the versioned GPL-2 document.
* Drop upstart-logd package. The logd daemon has been buggy for quite a
  while and thus removed completely upstream.
* debian/upstart.postinst
  - Use "telinit u" to tell init to re-exec itself.
* debian/rules
  - Remove obsolete configure flag.
  - Use dh_install instead of copying the job files around manually.
* Merge the upstart-compat-sysv, startup-tasks and system-services package
  into a single upstart package to avoid any unnecessary diversion between
  the Debian and Ubuntu packaging.
* The location of the job files has changed from /etc/event.d to /etc/init,
  in addition a *.conf suffix is now mandatory.
* Install rc.conf, rc-sysinit.conf, rcS.conf and control-alt-delete.conf as
  provided by upstream.
* debian/conf/*.conf
  - Update tty job files for the new job syntax. Add a description and
    author field.
  - Add dbus-reconnect.conf which tells Upstart to reconnect to the D-Bus
    system bus when runlevel 2345 has been reached.
* Update debian/upstart.install to reflect the changes above.
* Drop debian/upstart.dirs, obsolete.
* debian/README.Debian
  - Sync relevant changes from the latest Ubuntu package.
  - Remove outdated information.
* Add initial support for upstart-job.
  upstart-job is both a virtual package and also small helper utility which
  allows to execute native upstart jobs while preserving the legacy sysv
  "/etc/init.d/<service> <action>" interface.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
# Process this file with autoconf to produce a configure script.
2
2
 
3
 
AC_PREREQ(2.60)
4
 
AC_INIT([upstart], [0.3.9], [upstart-devel@lists.ubuntu.com])
5
 
AC_COPYRIGHT([[Copyright © 2007 Canonical Ltd.]])
 
3
AC_PREREQ(2.61)
 
4
AC_INIT([upstart], [0.6.2], [upstart-devel@lists.ubuntu.com])
 
5
AC_COPYRIGHT([[Copyright © 2009 Canonical Ltd.]])
6
6
AC_CONFIG_SRCDIR([init/main.c])
7
7
AC_CONFIG_MACRO_DIR([m4])
8
8
 
10
10
 
11
11
AM_INIT_AUTOMAKE([1.10 gnu nostdinc check-news dist-bzip2])
12
12
 
 
13
LT_PREREQ(2.2.4)
 
14
LT_INIT
 
15
 
13
16
AM_GNU_GETTEXT_VERSION([0.16.1])
14
17
AM_GNU_GETTEXT()
15
18
 
16
19
# Checks for programs.
17
20
AC_PROG_CC
18
21
AM_PROG_CC_C_O
19
 
AC_PROG_LIBTOOL
20
22
 
21
23
# Checks for libraries.
22
 
NIH_INIT
 
24
NIH_INIT([dbus])
23
25
 
24
26
# Checks for header files.
25
27
 
28
30
# Checks for library functions.
29
31
 
30
32
# Other checks
31
 
AC_ARG_ENABLE(compat,
32
 
        AS_HELP_STRING([--enable-compat],
33
 
                       [Enable compatibility tools]),
34
 
[case "$enable_compat" in
35
 
    yes|sysv) compat=sysv ;;
36
 
    no)       compat=none ;;
37
 
    *)        AC_MSG_ERROR([bad value $enable_compat for --enable-compat]) ;;
38
 
esac], [compat_sysv=none])dnl
39
 
AM_CONDITIONAL(COMPAT_SYSV, test "x$compat" = "xsysv")dnl
40
 
 
41
 
 
42
 
AC_CONFIG_FILES([ Makefile m4/Makefile po/Makefile.in intl/Makefile
43
 
                  nih/Makefile upstart/Makefile init/Makefile util/Makefile
44
 
                  compat/sysv/Makefile logd/Makefile doc/Makefile ])
 
33
AC_MSG_CHECKING([whether to include sbindir in PATH])
 
34
eval upstart_sbindir=\"$sbindir\"
 
35
case $upstart_sbindir in
 
36
    /sbin|//sbin|/usr/sbin|/usr/local/sbin)
 
37
        AC_MSG_RESULT([no])
 
38
        ;;
 
39
    *)
 
40
        AC_MSG_RESULT([yes])
 
41
        AC_DEFINE_UNQUOTED([EXTRA_PATH], ["$upstart_sbindir"],
 
42
                           [Directory to append to path.])
 
43
        ;;
 
44
esac
 
45
 
 
46
 
 
47
AC_CONFIG_FILES([ Makefile m4/Makefile intl/Makefile
 
48
                  nih/Makefile nih-dbus/Makefile nih-dbus-tool/Makefile
 
49
                  dbus/Makefile init/Makefile util/Makefile conf/Makefile
 
50
                  doc/Makefile contrib/Makefile po/Makefile.in ])
45
51
AC_CONFIG_HEADERS([config.h])
46
52
AC_OUTPUT