diff options
| author | Laurent Bigonville <bigon@bigon.be> | 2010-06-09 23:26:56 +0200 |
|---|---|---|
| committer | Laurent Bigonville <bigon@bigon.be> | 2010-06-09 23:26:56 +0200 |
| commit | 27c7aeb29425120664ad75725e3c6cabd6e29a31 (patch) | |
| tree | fa7777aedbb2c2535071649ba634bd5df9055b7b /configure.ac | |
| parent | 5d7bb76ee5fe206dd19f08af1917f37e25ece64f (diff) | |
Imported Upstream version 0.7upstream/0.7
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 7aa1b3b..65ceb4c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,18 +1,11 @@ AC_PREREQ(2.59) -AC_INIT(gypsy, 0.6, http://www.openedhand.com/~iain/gypsy) +AC_INIT(gypsy, 0.7, http://gypsy.freedesktop.org) AC_CONFIG_SRCDIR(src/main.c) -AM_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE([1.9 foreign]) -GYPSY_VERSION=1 +AM_CONFIG_HEADER(config.h) AC_PROG_CC -AC_ISC_POSIX - -AC_PROG_INSTALL -AC_PROG_LN_S -AC_PROG_MAKE_SET -AC_PROG_GCC_TRADITIONAL AM_PROG_LIBTOOL GYPSY_PC_MODULES='glib-2.0 dbus-glib-1 >= 0.60' @@ -28,8 +21,6 @@ PKG_CHECK_MODULES(GYPSY, $GYPSY_PC_MODULES) AC_SUBST(GYPSY_LIBS) AC_SUBST(GYPSY_CFLAGS) -GTK_DOC_CHECK([1.6]) - AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool) AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) @@ -37,16 +28,26 @@ DBUS_SYS_DIR="${sysconfdir}/dbus-1/system.d" AC_SUBST(DBUS_SYS_DIR) AC_DEFINE_UNQUOTED(DBUS_SYS_DIR, "$DBUS_SYS_DIR", [Where the system dir for D-Bus is]) -DBUS_SERVICES_DIR="${datadir}/dbus-1/services" +DBUS_SERVICES_DIR="${datadir}/dbus-1/system-services" AC_SUBST(DBUS_SERVICES_DIR) AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir for D-Bus is]) +AC_MSG_CHECKING([what user to run the daemon as]) +AC_ARG_WITH(user, AC_HELP_STRING([--with-user=USER],[What user to run the daemon as (default=root)]),, with_user=root) +AC_MSG_RESULT([$with_user]) + +AS_AC_EXPAND(LIBEXECDIR, $libexecdir) +AS_AC_EXPAND(DAEMON_USER, $with_user) + CFLAGS="$CFLAGS -g -Wall -Werror -Wno-format" +GTK_DOC_CHECK([1.6]) # TODO: add --with-xsltproc argument to override PATH AC_CHECK_PROGS(XSLT, xsltproc) AC_CONFIG_FILES([ +org.freedesktop.Gypsy.service +Gypsy.conf Makefile interfaces/Makefile src/Makefile |