diff options
author | Havoc Pennington <hp@pobox.com> | 2001-12-09 22:41:12 +0000 |
---|---|---|
committer | Havoc Pennington <hp@src.gnome.org> | 2001-12-09 22:41:12 +0000 |
commit | 6981a8198bdce947fa2f43a28babe427e740282b (patch) | |
tree | e247cdeeb2810c60ea00e7620e903fd82eca7668 /configure.in | |
parent | b3778e4470e08dab6017d0134c81607920110e74 (diff) | |
download | metacity-6981a8198bdce947fa2f43a28babe427e740282b.tar.gz metacity-6981a8198bdce947fa2f43a28babe427e740282b.tar.bz2 |
move SM init a bit later in the process, and init prefs
2001-12-09 Havoc Pennington <hp@pobox.com>
* src/main.c (main): move SM init a bit later in the process, and
init prefs
* src/session.c: fix no SM case (though I hardly know why I'm
bothering)
* src/main.c (main): call bindtextdomain
* src/util.h (_): actually call gettext
* configure.in: put in AM_GLIB_GNU_GETTEXT and gconf stuff
* src/prefs.c: Preferences - this marks the beginning of our doom.
None of them are actually implemented yet, but we monitor
some stuff from gconf.
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 98b50ad..1de63e2 100644 --- a/configure.in +++ b/configure.in @@ -38,11 +38,11 @@ fi changequote([,])dnl ALL_LINGUAS="es gl ru sv uk" -dnl AM_GNU_GETTEXT +AM_GLIB_GNU_GETTEXT ## here we get the flags we'll actually use -PKG_CHECK_MODULES(METACITY, gtk+-2.0 >= 1.3.10) -PKG_CHECK_MODULES(METACITY_RESTART, gtk+-2.0 >= 1.3.10) +PKG_CHECK_MODULES(METACITY, gtk+-2.0 >= 1.3.11 gconf-2.0 >= 1.1.5) +PKG_CHECK_MODULES(METACITY_RESTART, gtk+-2.0 >= 1.3.11) CFLAGS="$METACITY_CFLAGS $CFLAGS" @@ -82,6 +82,14 @@ LDFLAGS="$METACITY_LIBS $LDFLAGS" AC_CHECK_FUNCS(gdk_pixbuf_new_from_stream) LDFLAGS=$save_LDFLAGS +AC_PATH_PROG(GCONFTOOL, gconftool-2, no) + +if test x"$GCONFTOOL" = xno; then + AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) +fi + +AM_GCONF_SOURCE_2 + AC_OUTPUT([ Makefile src/Makefile |