[gconf] Add gconf_defaultpath to the pkg-config file to expose the location of the default path file. This
- From: Brian Cameron <bcameron src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gconf] Add gconf_defaultpath to the pkg-config file to expose the location of the default path file. This
- Date: Tue, 11 May 2010 22:06:07 +0000 (UTC)
commit 35d4dbb075ca800f4c0cfb9c417283f5e9adbeef
Author: Brian Cameron <Brian Cameron sun com>
Date: Tue May 11 17:04:51 2010 -0500
Add gconf_defaultpath to the pkg-config file to expose the location of the
default path file. This allows GDM to workaround bug #617017, so that GDM
bug #594818 can be fixed.
configure.in | 2 ++
gconf-2.0.pc.in | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/configure.in b/configure.in
index b3ab1ec..6c9ec26 100644
--- a/configure.in
+++ b/configure.in
@@ -112,7 +112,9 @@ if test "x${with_sysconfsubdir}" != "x"; then
else
sysgconfdir='${sysconfdir}'
fi
+gconfdefaultpath="$sysconfdir/$with_sysconfsubdir/$MAJOR_VERSION/path"
AC_SUBST(sysgconfdir)
+AC_SUBST(gconfdefaultpath)
dnl Save flags to aclocal
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
diff --git a/gconf-2.0.pc.in b/gconf-2.0.pc.in
index 9dc2229..8734b13 100644
--- a/gconf-2.0.pc.in
+++ b/gconf-2.0.pc.in
@@ -3,7 +3,7 @@ exec_prefix= exec_prefix@
libdir= libdir@
includedir= includedir@
gconf_serverdir= libexecdir@
-
+gconf_defaultpath= gconfdefaultpath@
Name: gconf
Description: GNOME Config System.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]