mirror of
https://github.com/troglobit/finit.git
synced 2026-10-31 13:00:32 +00:00
Merge pull request #447 from liuming50/sd-daemon-fix-a-compilation-error
This commit is contained in:
3 files changed
+10
-2
No files matched your search
@@ -2,6 +2,8 @@
|
|||||||
lib_LTLIBRARIES = libsystemd.la
|
lib_LTLIBRARIES = libsystemd.la
|
||||||
libsystemd_la_SOURCES = sd-daemon.c sd-daemon.h
|
libsystemd_la_SOURCES = sd-daemon.c sd-daemon.h
|
||||||
libsystemd_la_LDFLAGS = -version-info 0:0:0
|
libsystemd_la_LDFLAGS = -version-info 0:0:0
|
||||||
|
libsystemd_la_CFLAGS = $(lite_CFLAGS)
|
||||||
|
libsystemd_la_LIBADD = $(lite_LIBS)
|
||||||
|
|
||||||
# pkg-config support
|
# pkg-config support
|
||||||
pkgconfigdir = $(libdir)/pkgconfig
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
@@ -9,4 +11,4 @@ pkgconfig_DATA = libsystemd.pc
|
|||||||
|
|
||||||
# Install header to systemd/ subdirectory
|
# Install header to systemd/ subdirectory
|
||||||
systemddir = $(includedir)/systemd
|
systemddir = $(includedir)/systemd
|
||||||
systemd_HEADERS = sd-daemon.h
|
systemd_HEADERS = sd-daemon.h
|
||||||
@@ -23,6 +23,11 @@
|
|||||||
#include <sys/un.h>
|
#include <sys/un.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
#ifdef _LIBITE_LITE
|
||||||
|
# include <libite/lite.h>
|
||||||
|
#else
|
||||||
|
# include <lite/lite.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "sd-daemon.h"
|
#include "sd-daemon.h"
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ noinst_PROGRAMS = serv
|
|||||||
serv_SOURCES = serv.c
|
serv_SOURCES = serv.c
|
||||||
serv_CPPFLAGS = -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_GNU_SOURCE -D_DEFAULT_SOURCE -I$(top_builddir)
|
serv_CPPFLAGS = -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_GNU_SOURCE -D_DEFAULT_SOURCE -I$(top_builddir)
|
||||||
if LIBSYSTEMD
|
if LIBSYSTEMD
|
||||||
serv_CPPFLAGS += -I$(top_srcdir)/libsystemd
|
serv_CPPFLAGS += -I$(top_srcdir)/libsystemd $(lite_CFLAGS)
|
||||||
serv_SOURCES += $(top_srcdir)/libsystemd/sd-daemon.c
|
serv_SOURCES += $(top_srcdir)/libsystemd/sd-daemon.c
|
||||||
|
serv_LDADD = $(lite_LIBS)
|
||||||
endif
|
endif
|
||||||
Reference in new issue
Block a user