diff options
| author | TingPing <tingping@tingping.se> | 2013-05-08 23:41:52 -0400 |
|---|---|---|
| committer | TingPing <tingping@tingping.se> | 2013-05-08 23:41:52 -0400 |
| commit | dba9c424733aef64f984bb1f49bf76ee8de79100 (patch) | |
| tree | a398f883351f93cb2fd318cd38646570639232d0 | |
| parent | f8556360caf052e3fe78b5bc9f20a58a6930819a (diff) | |
stop using gconf
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | src/common/dbus/Makefile.am | 26 |
2 files changed, 19 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac index bee4ff41..88f8464d 100644 --- a/configure.ac +++ b/configure.ac @@ -237,11 +237,11 @@ GUI_CFLAGS="$GUI_CFLAGS $GTK_CFLAGS -DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DIS #fi # GConf -if test "$gnome" != no ; then - AC_PATH_PROG(GCONFTOOL, gconftool-2, no) -else - GCONFTOOL=no -fi +#if test "$gnome" != no ; then +# AC_PATH_PROG(GCONFTOOL, gconftool-2, no) +#else +# GCONFTOOL=no +#fi dnl ********************************************************************* 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_SYSINFO, test "x$sysinfo" = "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 ** SOCKS5 *********************************************************** diff --git a/src/common/dbus/Makefile.am b/src/common/dbus/Makefile.am index 62728e28..c4b38fbd 100644 --- a/src/common/dbus/Makefile.am +++ b/src/common/dbus/Makefile.am @@ -40,17 +40,17 @@ service_DATA = $(service_in_files:.service.in=.service) $(service_DATA): $(service_in_files) Makefile @sed -e "s|\@bindir\@|$(bindir)|" $< > $@ -if DO_GCONF -GCONF_SCHEMA_CONFIG_SOURCE = `$(GCONFTOOL) --get-default-source` -GCONF_SCHEMA_FILE_DIR = $(sysconfdir)/gconf/schemas -schemadir = $(GCONF_SCHEMA_FILE_DIR) -schema_DATA = apps_hexchat_url_handler.schemas +#if DO_GCONF +#GCONF_SCHEMA_CONFIG_SOURCE = `$(GCONFTOOL) --get-default-source` +#GCONF_SCHEMA_FILE_DIR = $(sysconfdir)/gconf/schemas +#schemadir = $(GCONF_SCHEMA_FILE_DIR) +#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: - 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: -endif +#endif |