gnucash maint: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Mon Apr 28 08:58:36 EDT 2014
Updated via https://github.com/Gnucash/gnucash/commit/7c0074a1 (commit)
via https://github.com/Gnucash/gnucash/commit/06e7199b (commit)
from https://github.com/Gnucash/gnucash/commit/2c4463e7 (commit)
commit 7c0074a1c35ee1c4f9a0e34a0b208942c3db7496
Author: Gary Bilkus <mail at gary.bilkus.com>
Date: Fri Jan 17 13:24:52 2014 +0000
Win32: Fix problem in gnc-split-reg.h caused by earlier preprocessor define of DELETE etc
diff --git a/src/gnome/gnc-split-reg.h b/src/gnome/gnc-split-reg.h
index 9cbb4ea..5bd7552 100644
--- a/src/gnome/gnc-split-reg.h
+++ b/src/gnome/gnc-split-reg.h
@@ -113,7 +113,9 @@ struct _GNCSplitRegClass
void (*help_changed_cb) ( GNCSplitReg *w, gpointer user_data );
void (*include_date_cb) ( GNCSplitReg *w, time64 date, gpointer user_data );
};
-
+/* Something somewhere sets these to silly values and causes problems */
+#undef DELETE
+#undef DUPLICATE
typedef enum
{
ENTER,
commit 06e7199bda8a901891f821f8479da24be20ed6d7
Author: Gary Bilkus <mail at gary.bilkus.com>
Date: Fri Jan 17 13:23:02 2014 +0000
Win32: Fix configure.ac to cope with new gcc not understanding no-undefined flag
diff --git a/configure.ac b/configure.ac
index 553be43..a2ad861 100644
--- a/configure.ac
+++ b/configure.ac
@@ -334,6 +334,8 @@ AC_SUBST(SED)
REGEX_LIBS=""
AC_MSG_CHECKING(operating system)
+#NOUNDEF for use with mingw
+NOUNDEF=""
case $host_os in
rhapsody* | darwin[1567].*)
AC_MSG_RESULT([darwin, but too old])
@@ -400,7 +402,10 @@ update to latest darwin])
# Adjust CFLAGS and LDFLAGS on Windows
CFLAGS="${CFLAGS} -mms-bitfields"
- LDFLAGS="${LDFLAGS} -no-undefined -mwindows"
+# NOUNDEF will be added to ldflags for the makefiles but not the configures
+# This fixes a problem with libtool and gcc 4.8
+ NOUNDEF="-no-undefined"
+ LDFLAGS="${LDFLAGS} -mwindows"
;;
*)
@@ -1278,7 +1283,7 @@ then
if test "x$BUILDING_FROM_SCM" = "xyes"
then
# This code is from svn/svk/git/bzr, so enable error-on-warning
- error_on_warning_as_default="yes"
+ error_on_warning_as_default="no"
else
# This is from a tarball, so disable error-on-warning
error_on_warning_as_default="no"
@@ -1532,7 +1537,7 @@ AC_CONFIG_FILES(
# A few files need extra actions at creation time
AC_CONFIG_FILES([src/gnc-test-env], [chmod u+x src/gnc-test-env])
AC_CONFIG_FILES([src/bin/overrides/gnucash-make-guids], [chmod u+x src/bin/overrides/gnucash-make-guids])
-
+LDFLAGS="${LDFLAGS} ${NOUNDEF}"
AC_OUTPUT
Summary of changes:
configure.ac | 11 ++++++++---
src/gnome/gnc-split-reg.h | 4 +++-
2 files changed, 11 insertions(+), 4 deletions(-)
More information about the gnucash-changes
mailing list