Skip to content

Instantly share code, notes, and snippets.

@bl8
Created October 12, 2013 20:09
Show Gist options
  • Save bl8/6954333 to your computer and use it in GitHub Desktop.
Save bl8/6954333 to your computer and use it in GitHub Desktop.
Autotools stuff for GSettings
diff --git a/data/Makefile.am b/data/Makefile.am
index f4af134..3937c2d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -21,15 +21,22 @@ appdatadir = $(datadir)/appdata
dist_appdata_DATA = $(appdata_in_files:.xml.in=.xml)
appdata_in_files = banshee.appdata.xml.in
+gsettingsschema_in_files = org.gnome.banshee.gschema.xml.in
+gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
+
+@GSETTINGS_RULES@
+
all: addin-xml-strings.cs
EXTRA_DIST = \
$(dbusservice_in_files) \
addin-xml-strings.cs \
- $(appdata_in_files)
+ $(appdata_in_files) \
+ $(gsettingsschema_in_files)
CLEANFILES = \
- $(appdata_DATA)
+ $(appdata_DATA) \
+ $(gsettings_SCHEMAS)
DISTCLEANFILES = \
$(dbusservice_DATA)
diff --git a/configure.ac b/configure.ac
index 02cb201..0077700 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([build/m4])
AC_SUBST([ACLOCAL_AMFLAGS], ["-I build/m4/shamrock -I build/m4/banshee -I build/m4/shave \${ACLOCAL_FLAGS}"])
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL([0.50.1])
AC_PROG_LIBTOOL
AC_PROG_INSTALL
@@ -136,11 +136,9 @@ dnl GNOME (optional)
AC_ARG_ENABLE(gnome, AC_HELP_STRING([--disable-gnome], [Disable GNOME support]), , enable_gnome="yes")
if test "x$enable_gnome" = "xyes"; then
BANSHEE_CHECK_GNOME_SHARP
- BANSHEE_CHECK_GCONF
+ GLIB_GSETTINGS
AM_CONDITIONAL(ENABLE_GNOME, true)
else
- AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, false)
- AM_CONDITIONAL(HAVE_DBUS_GLIB, false)
AM_CONDITIONAL(ENABLE_GNOME, false)
fi
@@ -226,6 +224,7 @@ build/pkg-config/Makefile
data/Makefile
data/org.bansheeproject.Banshee.service
data/org.bansheeproject.CollectionIndexer.service
+data/org.gnome.banshee.gschema.xml
data/audio-profiles/Makefile
data/desktop-files/Makefile
data/desktop-files/common.desktop
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 18fbcde..ecd92d8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,6 +2,7 @@
# Please keep this file in alphabetical order; run ./sort-potfiles
# after adding files here.
[encoding: UTF-8]
+[type: gettext/gsettings]data/org.gnome.banshee.gschema.xml.in
data/addin-xml-strings.cs
data/audio-profiles/aac-novell.xml.in
data/audio-profiles/base.xml.in
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment