Merge branch 'maint'

This commit is contained in:
Geert Janssens
2020-01-17 18:35:30 +01:00
64 changed files with 196 additions and 3523 deletions

View File

@@ -24,8 +24,8 @@
/* Using GDK Quartz (not X11) */
#cmakedefine GDK_QUARTZ
/* Name of our gettext-domain */
#define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
/* Name of our gettext-domain, needed for gi18n-lib.h */
#define GETTEXT_PACKAGE "@PROJECT_NAME@"
/* Cocoa/Nexstep/GnuStep framework */
#cmakedefine GNC_PLATFORM_COCOA 1
@@ -57,18 +57,6 @@
/* Most recent stable GnuCash series */
#define GNUCASH_LATEST_STABLE_SERIES "@GNUCASH_LATEST_STABLE_SERIES@"
/* GnuCash Major version number */
#define GNUCASH_MAJOR_VERSION @GNUCASH_MAJOR_VERSION@
/* GnuCash Micro version number */
#define GNUCASH_MICRO_VERSION @GNUCASH_MICRO_VERSION@
/* GnuCash Minor version number */
#define GNUCASH_MINOR_VERSION @GNUCASH_MINOR_VERSION@
/* GnuCash Nano version number */
#define GNUCASH_NANO_VERSION @GNUCASH_NANO_VERSION@
/* GnuCash earliest compatible databaseversion number */
#define GNUCASH_RESAVE_VERSION @GNUCASH_RESAVE_VERSION@
@@ -270,9 +258,6 @@
/* Define to the sub-directory where libtool stores uninstalled libraries. */
#define LT_OBJDIR ".libs/"
/* Name of package */
#define PACKAGE "@PACKAGE@"
/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@"
@@ -282,14 +267,26 @@
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "@PACKAGE_STRING@"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "@PACKAGE_TARNAME@"
/* Define to the home page for this package. */
#define PACKAGE_URL "@PACKAGE_URL@"
/* Define to the version of this package. */
#define PACKAGE_VERSION "@PACKAGE_VERSION@"
/* Name of project */
#define PROJECT_NAME "@PROJECT_NAME@"
/* Version number of package */
#define PROJECT_VERSION "@PROJECT_VERSION@"
/* GnuCash Major version number */
#define PROJECT_VERSION_MAJOR @PROJECT_VERSION_MAJOR@
/* GnuCash Micro version number */
#define PROJECT_VERSION_MICRO @PROJECT_VERSION_PATCH@
/* GnuCash Minor version number */
#define PROJECT_VERSION_MINOR @PROJECT_VERSION_MINOR@
/* GnuCash Nano version number */
#define PROJECT_VERSION_NANO @PROJECT_VERSION_TWEAK@
/* Define to necessary symbol if this constant uses a non-standard name on
your system. */
@@ -333,9 +330,6 @@
#endif
/* Version number of package */
#define VERSION "@VERSION@"
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
#if defined AC_APPLE_UNIVERSAL_BUILD