~vorlon/ubuntu/raring/upstart/lp.1199778

Attempt to cherry-pick fixes for bug #1199778 to raring; something is still
missing though, the test suite segfaults on one of the json loads.

added added

removed removed

## Process this file with automake to produce Makefile.in

INITCTL_BINARY = $(abs_top_builddir)/util/initctl

UPSTART_BINARY = $(abs_top_builddir)/init/init

AM_CFLAGS = \

$(NIH_CFLAGS) \

$(NIH_DBUS_CFLAGS) \

$(DBUS_CFLAGS)

AM_CPPFLAGS = \

-DLOCALEDIR="\"$(localedir)\"" \

-DINITCTL_BUILD \

-DSBINDIR="\"$(sbindir)\"" \

-DUPSTART_BINARY="\"$(UPSTART_BINARY)\"" \

-DINITCTL_BINARY="\"$(INITCTL_BINARY)\"" \

-I$(top_builddir) -I$(top_srcdir) -iquote$(builddir) -iquote$(srcdir) \

-I$(top_srcdir)/intl

check_LIBRARIES = libtest_util_common.a

libtest_util_common_a_SOURCES = test_util_common.c test_util_common.h