grim/guifications3

removed the dbus checking stuff from gfd, we'll add this back as part of the dbus plugins
org.guifications.gf3
2009-09-12, Gary Kramlich
508df3091ad7
Parents 3730399fdcde
Children 0f063ea6686e
removed the dbus checking stuff from gfd, we'll add this back as part of the dbus plugins
4 files changed, 0 insertions(+), 98 deletions(-)
  • +0 -13
    guifications-daemon/Makefile.am
  • +0 -65
    guifications-daemon/configure.ac
  • +0 -17
    guifications-daemon/guifications-daemon.conf
  • +0 -3
    guifications-daemon/guifications-daemon.service.in
    • --- a/guifications-daemon/Makefile.am Sat Sep 12 23:42:33 2009 -0500
    +++ b/guifications-daemon/Makefile.am Sat Sep 12 23:53:27 2009 -0500
    @@ -28,16 +28,3 @@
    libtool: $(LIBTOOL_DEPS)
    $(SHELL) ./config.status --recheck
    -if HAVE_DBUS
    -
    -dbusdir = $(DBUS_SYSTEM_DIR)
    -dbus_DATA = guifications-daemon.conf
    -
    -servicedir = $(DBUS_SERVICES_DIR)
    -service_in_files = guifications-daemon.service.in
    -service_DATA = guifications-daemon.service
    -
    -%.service: %.service.in
    - @sed -e "s|\@bindir\@|$(bindir)|" $< > $@
    -
    -endif
    --- a/guifications-daemon/configure.ac Sat Sep 12 23:42:33 2009 -0500
    +++ b/guifications-daemon/configure.ac Sat Sep 12 23:53:27 2009 -0500
    @@ -79,15 +79,6 @@
    AC_DEFINE(DEBUG, 1, [Define if debugging is enabled.])
    fi
    -AC_ARG_ENABLE(deprecated,
    - AC_HELP_STRING([--disable-deprecated],[compile without deprecated API usage])
    - ,,enable_deprecated=yes)
    -
    -if test "x$enable_deprecated" = no; then
    - DEBUG_CFLAGS = "$DEBUG_CFLAGS -DG_DISABLE_DEPRECATED"
    -fi
    -AC_SUBST(DEBUG_CFLAGS)
    -
    if test x"$GCC" = x"yes"; then
    CFLAGS="$CFLAGS -Wall -g3"
    fi
    @@ -108,59 +99,10 @@
    AC_SUBST(GFLIB_CFLAGS)
    AC_SUBST(GFLIB_LIBS)
    -dnl ######################################################################
    -dnl # Determine the dbus paths
    -dnl #
    -dnl # We need some way to determine if we should even bother determining
    -dnl # these.
    -dnl ######################################################################
    -DBUS_SYSTEM_DIR=""
    -DBUS_SERVICES_DIR=""
    -
    -AC_MSG_CHECKING([gflib-dbus])
    -
    -HAVE_DBUS="no"
    -
    -gflib-queryplugins gflib-dbus >/dev/null 2>&1
    -if test $? == 0 ; then
    - if test x"$prefix" = x"NONE"; then
    - DBUS_SYSTEM_DIR=`pkg-config --variable=sysconfdir dbus-1`
    - DBUS_SERVICES_DIR=`pkg-config --variable=session_bus_services_dir dbus-1`
    -
    - if test x"$DBUS_SYSTEM_DIR" = x"" -o x"$DBUS_SERVICES_DIR" = x""; then
    - DBUS_SYSTEM_DIR=""
    - DBUS_SYSTEM_DIR=""
    - else
    - dnl # append dbus-1/system.d to the system dir
    - DBUS_SYSTEM_DIR="$DBUS_SYSTEM_DIR/dbus-1/system.d"
    -
    - HAVE_DBUS="yes"
    - fi
    - else
    - DBUS_SYSTEM_DIR="$sysconfdir/dbus-1/system.d"
    - DBUS_SERVICES_DIR="$datadir/dbus-1/services"
    -
    - HAVE_DBUS="yes"
    - fi
    -fi
    -
    -AM_CONDITIONAL(HAVE_DBUS, test x"$HAVE_DBUS" = x"yes")
    -AC_MSG_RESULT($HAVE_DBUS)
    -
    -AC_SUBST(DBUS_SYSTEM_DIR)
    -AC_SUBST(DBUS_SERVICES_DIR)
    -
    -dnl #######################################################################
    -dnl # Expand some vars
    -dnl #######################################################################
    -AS_AC_EXPAND(BINDIR,$bindir)
    -
    dnl #######################################################################
    dnl # Finish up
    dnl #######################################################################
    AC_OUTPUT([Makefile
    - guifications-daemon.pc
    - guifications-daemon.service
    m4/Makefile
    po/Makefile.in
    src/Makefile
    @@ -174,13 +116,6 @@
    echo AC_PACKAGE_NAME AC_PACKAGE_VERSION Configuration complete
    echo;
    echo Debugging enabled................: $enable_debug
    -echo Deprecated API enabled...........: $enable_deprecated
    -echo;
    -echo Have dbus........................: $HAVE_DBUS
    -if test x"$HAVE_DBUS" = x"yes"; then
    - echo D-Bus system directory...........: $DBUS_SYSTEM_DIR
    - echo D-Bus services directory.........: $DBUS_SERVICES_DIR
    -fi
    echo;
    echo Type make to compile
    echo;
    --- a/guifications-daemon/guifications-daemon.conf Sat Sep 12 23:42:33 2009 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,17 +0,0 @@
    -<!DOCTYPE busconfig PUBLIC
    - "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
    - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
    -
    -<busconfig>
    - <policy user="root">
    - <allow own="org.guifications"/>
    - </policy>
    -
    - <policy context="default">
    - <allow send_interface="org.guifications.Feeds"/>
    - <allow send_interface="org.guifications.Preferences"/>
    -
    - <allow receive_interface="org.guifications"
    - receive_sender="org.guifications"/>
    - </policy>
    -</busconfig>
    --- a/guifications-daemon/guifications-daemon.service.in Sat Sep 12 23:42:33 2009 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,3 +0,0 @@
    -[D-BUS Service]
    -Name=org.guifications
    -Exec=@bindir@/guifications-daemon