Mercurial > audlegacy
changeset 727:c331d6c6880a trunk
[svn] - gconf
| author | nenolod |
|---|---|
| date | Mon, 27 Feb 2006 06:34:58 -0800 |
| parents | b50d5337a8ce |
| children | e39735f0b2f7 |
| files | configure.ac libaudacious/Makefile.in mk/rules.mk.in |
| diffstat | 3 files changed, 10 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Mon Feb 27 06:31:47 2006 -0800 +++ b/configure.ac Mon Feb 27 06:34:58 2006 -0800 @@ -191,8 +191,13 @@ ) fi -AM_CONDITIONAL(HAVE_GCONF, test "$enable_gconf" = "yes") +if test "$enable_gconf" = "yes"; then + CONFIGDB_BACKEND="gconf" +else + CONFIGDB_BACKEND="rcfile" +fi +AC_SUBST(CONFIGDB_BACKEND) dnl GnomeVFS support @@ -218,6 +223,8 @@ VFS_BACKEND="stdio" fi +AC_SUBST(VFS_BACKEND) + dnl Check for esound AC_ARG_ENABLE( esd,
--- a/libaudacious/Makefile.in Mon Feb 27 06:31:47 2006 -0800 +++ b/libaudacious/Makefile.in Mon Feb 27 06:34:58 2006 -0800 @@ -20,12 +20,7 @@ -I.. \ -I../intl -#if HAVE_GCONF -# CONF_SRC = configdb_gconf.c -#else - CONF_SRC = configdb_rcfile.c -#endif - +CONF_SRC = configdb_$(CONFIGDB_BACKEND).c VFS_SRC = vfs_$(VFS_BACKEND).c SOURCES = \
--- a/mk/rules.mk.in Mon Feb 27 06:31:47 2006 -0800 +++ b/mk/rules.mk.in Mon Feb 27 06:34:58 2006 -0800 @@ -301,6 +301,7 @@ target_vendor = @target_vendor@ WAV_SNDFILE = @WAV_SNDFILE@ VFS_BACKEND = @VFS_BACKEND@ +CONFIGDB_BACKEND = @CONFIGDB_BACKEND@ CURL_CFLAGS = @CURL_CFLAGS@ CURL_LIBS = @CURL_LIBS@ MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@