Merge changes from gramps20 made since 2.0.5

svn: r5105
This commit is contained in:
Alex Roitman
2005-08-18 05:58:28 +00:00
parent af49dc3f91
commit fc2b33c116
111 changed files with 31121 additions and 20132 deletions

View File

@@ -16,6 +16,12 @@ then
VERSIONSTRING="$VERSION-$RELEASE"
fi
dnl Checking for gconftool-2
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_GCONF2_REPLACEMENT
AM_SHARED_MIME
AM_PACKAGER
@@ -254,6 +260,7 @@ src/po/Makefile
doc/Makefile
doc/gramps-manual/Makefile
doc/gramps-manual/C/Makefile
doc/gramps-manual/fr/Makefile
example/Makefile
example/gramps/Makefile
gramps.spec