From: Marcel Holtmann Date: Thu, 8 Jan 2009 20:57:51 +0000 (+0100) Subject: Add option to disable installation for data files X-Git-Tag: accepted/2.0alpha-wayland/20121110.002834~4073 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ee789c58f87dc413529f51342b75fef525604aac;p=profile%2Fivi%2Fconnman.git Add option to disable installation for data files --- diff --git a/Makefile.am b/Makefile.am index 5f40b57..37bb4e0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,6 +6,7 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = connman.pc DISTCHECK_CONFIGURE_FLAGS = --disable-gtk-doc \ + --disable-datafiles \ --enable-loopback \ --enable-ethernet \ --enable-wifi \ diff --git a/bootstrap-configure b/bootstrap-configure index 340d80b..3264b32 100755 --- a/bootstrap-configure +++ b/bootstrap-configure @@ -16,6 +16,7 @@ fi --mandir=/usr/share/man \ --localstatedir=/var \ --sysconfdir=/etc \ + --disable-datafiles \ --enable-loopback \ --enable-ethernet \ --enable-wifi \ diff --git a/configure.ac b/configure.ac index 8e6fa94..8e85d33 100644 --- a/configure.ac +++ b/configure.ac @@ -226,6 +226,11 @@ AC_ARG_ENABLE(fake, AC_HELP_STRING([--enable-fake], [enable fake device support]), [enable_fake=${enableval}]) AM_CONDITIONAL(FAKE, test "${enable_fake}" = "yes") +AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles], + [don't install configuration and data files]), + [enable_datafiles=${enableval}]) +AM_CONDITIONAL(DATAFILES, test "${enable_datafiles}" != "no") + AC_OUTPUT(Makefile gdbus/Makefile include/Makefile include/version.h src/Makefile src/connman.service scripts/connman scripts/Makefile plugins/Makefile client/Makefile diff --git a/plugins/Makefile.am b/plugins/Makefile.am index befc2d9..0bda028 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -96,10 +96,12 @@ polkit_la_SOURCES = polkit.c polkit_la_LIBADD = @POLKIT_LIBS@ @GLIB_LIBS@ polkit_la_CFLAGS = @GLIB_CFLAGS@ @POLKIT_CFLAGS@ +if DATAFILES policydir = @POLKIT_DATADIR@ policy_DATA = connman.policy endif +endif if FAKE plugin_LTLIBRARIES += fake.la diff --git a/src/Makefile.am b/src/Makefile.am index 363cfc3..4eda671 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,9 @@ +if DATAFILES dbusdir = @DBUS_DATADIR@ dbus_DATA = connman.conf +endif sbin_PROGRAMS = connmand @@ -13,10 +15,12 @@ connmand_SOURCES = main.c connman.h log.c selftest.c error.c plugin.c \ if UDEV connmand_SOURCES += udev.c +if DATAFILES rulesdir = @UDEV_DATADIR@ rules_DATA = 92-connman.rules endif +endif connmand_LDADD = @GDBUS_LIBS@ @GLIB_LIBS@ @UDEV_LIBS@ -ldl