moparisthebest
/
hexchat
mirror of https://github.com/moparisthebest/hexchat
1
0
Fork 0
Code Issues Releases Wiki Activity

stop using gconf

This commit is contained in:
TingPing 2013-05-08 23:41:52 -04:00
parent f8556360ca
commit dba9c42473
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@ -237,11 +237,11 @@ GUI_CFLAGS="$GUI_CFLAGS $GTK_CFLAGS -DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DIS
#fi #fi
# GConf # GConf
if test "$gnome" != no ; then #if test "$gnome" != no ; then
AC_PATH_PROG(GCONFTOOL, gconftool-2, no) # AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
else #else
GCONFTOOL=no # GCONFTOOL=no
fi #fi
dnl ********************************************************************* dnl *********************************************************************
dnl ** XFT ************************************************************** dnl ** XFT **************************************************************
@ -684,7 +684,7 @@ AM_CONDITIONAL(DO_DOAT, test "x$doat" = "xyes")
AM_CONDITIONAL(DO_FISHLIM, test "x$fishlim" = "xyes") AM_CONDITIONAL(DO_FISHLIM, test "x$fishlim" = "xyes")
AM_CONDITIONAL(DO_SYSINFO, test "x$sysinfo" = "xyes") AM_CONDITIONAL(DO_SYSINFO, test "x$sysinfo" = "xyes")
AM_CONDITIONAL(USE_DBUS, test "x$dbus" = "xyes") AM_CONDITIONAL(USE_DBUS, test "x$dbus" = "xyes")
AM_CONDITIONAL(DO_GCONF, test "x$GCONFTOOL" != "xno") #AM_CONDITIONAL(DO_GCONF, test "x$GCONFTOOL" != "xno")
dnl ********************************************************************* dnl *********************************************************************
dnl ** SOCKS5 *********************************************************** dnl ** SOCKS5 ***********************************************************

26
src/common/dbus/Makefile.am
View File

@ -40,17 +40,17 @@ service_DATA = $(service_in_files:.service.in=.service)
$(service_DATA): $(service_in_files) Makefile $(service_DATA): $(service_in_files) Makefile
@sed -e "s|\@bindir\@|$(bindir)|" $< > $@ @sed -e "s|\@bindir\@|$(bindir)|" $< > $@
if DO_GCONF #if DO_GCONF
GCONF_SCHEMA_CONFIG_SOURCE = `$(GCONFTOOL) --get-default-source` #GCONF_SCHEMA_CONFIG_SOURCE = `$(GCONFTOOL) --get-default-source`
GCONF_SCHEMA_FILE_DIR = $(sysconfdir)/gconf/schemas #GCONF_SCHEMA_FILE_DIR = $(sysconfdir)/gconf/schemas
schemadir = $(GCONF_SCHEMA_FILE_DIR) #schemadir = $(GCONF_SCHEMA_FILE_DIR)
schema_DATA = apps_hexchat_url_handler.schemas #schema_DATA = apps_hexchat_url_handler.schemas
#install-data-local:
# if test -z "$(DESTDIR)" ; then \
# for p in $(schema_DATA) ; do \
# GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p; \
# done \
# fi
#else
install-data-local: install-data-local:
if test -z "$(DESTDIR)" ; then \ #endif
for p in $(schema_DATA) ; do \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p; \
done \
fi
else
install-data-local:
endif