on libgcrypt. GnuTLS >= 2.12 does not depend on libgcrypt any longer. * Don't add filename defines to CPPFLAGS; there are quoting problems and gcc4 ends up warning, gcc3 aborts. Move the setting to Makefile.in. * The database subpackages shouldn't depend on the exact REVISION of the main package.