diff options
| author | Brian Cameron <Brian.Cameron@sun.com> | 2010-05-11 17:04:51 -0500 |
|---|---|---|
| committer | Brian Cameron <Brian.Cameron@sun.com> | 2010-05-11 17:04:51 -0500 |
| commit | 35d4dbb075ca800f4c0cfb9c417283f5e9adbeef (patch) | |
| tree | 1bdd051805a2a90b4444738be2ac4c49d58c273a | |
| parent | f2942e9c02faaa310b5dd5baa52d4f4ebf85b339 (diff) | |
| download | gconf-35d4dbb075ca800f4c0cfb9c417283f5e9adbeef.tar.gz | |
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.
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | gconf-2.0.pc.in | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/configure.in b/configure.in index b3ab1ec3..6c9ec26f 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 9dc22293..8734b135 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. |