diff options
| -rw-r--r-- | .cvsignore | 1 | ||||
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | gconf-2.m4.in | 9 |
4 files changed, 14 insertions, 12 deletions
@@ -23,3 +23,4 @@ gconf-2.0.pc gconf.spec gconf.m4 GConf-*.tar.gz +mkinstalldirs @@ -1,3 +1,12 @@ +2005-09-13 Stepan Kasal <kasal@ucw.cz> + + * gconf-2.m4.in (AM_GCONF_SOURCE_2): Simplify the handling of + --enable-schemas-install. + * Makefile.am (EXTRA_DIST): Remove sources for files gnerated at + config time; they are distributed automatically. + (DISTCLEANFILES): Deleted; we don't use intltool here. + * .cvsignore: Add mkinstalldirs. + 2005-09-10 Tor Lillqvist <tml@novell.com> * gconf/gconf-backend.c (gconf_address_resource): On Win32, do diff --git a/Makefile.am b/Makefile.am index 8b7ee30c..427d6026 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,17 +3,10 @@ SUBDIRS = gconf backends po doc examples DIST_SUBDIRS=tests $(SUBDIRS) EXTRA_DIST = \ - gconf-2.m4.in \ - gconf-zip.in \ TODO \ - gconf-2.0.pc.in \ gtk-doc.make DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc -DISTCLEANFILES = \ - intltool-extract \ - intltool-merge \ - intltool-update install-data-local: -mkdir -p $(DESTDIR)$(sysgconfdir)/gconf.xml.defaults diff --git a/gconf-2.m4.in b/gconf-2.m4.in index 57e2dda1..aca7c7da 100644 --- a/gconf-2.m4.in +++ b/gconf-2.m4.in @@ -31,10 +31,9 @@ AC_DEFUN([AM_GCONF_SOURCE_2], AC_ARG_ENABLE(schemas-install, [ --disable-schemas-install Disable the schemas installation], - [case "${enableval}" in - yes) schemas_install=true ;; - no) schemas_install=false ;; + [case ${enableval} in + yes|no) ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;; - esac],[schemas_install=true]) - AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, test x$schemas_install = xtrue) + esac]) + AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) ]) |