gnucash maint: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/8187624b (commit)
	 via  https://github.com/Gnucash/gnucash/commit/f4510cf5 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/897fc841 (commit)
	from  https://github.com/Gnucash/gnucash/commit/e8c15910 (commit)



commit 8187624b680dfcd461fa8cd83d0c16248887134c
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Tue Jan 10 16:21:47 2017 +0100

    Fix compiler warning about confusing indentation

diff --git a/src/engine/gnc-commodity.c b/src/engine/gnc-commodity.c
index 80438e8..aa7c540 100644
--- a/src/engine/gnc-commodity.c
+++ b/src/engine/gnc-commodity.c
@@ -2097,7 +2097,7 @@ gnc_commodity_is_currency(const gnc_commodity *cm)
 
 /********************************************************************
  * gnc_commodity_table_get_commodities
- * list commodities in a give namespace
+ * list commodities in a given namespace
  ********************************************************************/
 
 static CommodityList*
@@ -2114,7 +2114,7 @@ commodity_table_get_all_noncurrency_commodities(const gnc_commodity_table* table
         ns = gnc_commodity_table_find_namespace(table, (char*)(node->data));
         if (!ns)
             continue;
-            retval = g_list_concat(g_hash_table_values(ns->cm_table), retval);
+        retval = g_list_concat(g_hash_table_values(ns->cm_table), retval);
     }
     g_list_free(nslist);
     return retval;

commit f4510cf54690755ddb6a82b23860799067650ada
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Tue Jan 10 13:21:14 2017 +0100

    Drop unused DEBUG_MEMORY macro
    
    Thanks to Stefan Talpalaru for spotting this.

diff --git a/configure.ac b/configure.ac
index e03219f..7796c3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -725,7 +725,6 @@ AC_SUBST(GNC_SCM_INSTALL_DIR)
 AC_SUBST(GNC_SHAREDIR)
 AC_SUBST(GNC_LIBEXECDIR)
 
-dnl is DEBUG_MEMORY still used somewhere?
 AC_ARG_ENABLE( debug,
   [AS_HELP_STRING([--enable-debug],[compile with debugging flags set])],
   [
@@ -735,7 +734,6 @@ AC_ARG_ENABLE( debug,
      # ...except for those the user wants.
      CFLAGS="${CFLAGS} -g ${USER_OPTIMIZATION}"
      LDFLAGS="${LDFLAGS} -g"
-     AC_DEFINE(DEBUG_MEMORY,1,[Enable debug memory])
   fi
   ])
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a4397c0..c6fde05 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -38,10 +38,6 @@ IF (NOT DISABLE_NLS)
 SET(ENABLE_NLS 1)
 ENDIF(NOT DISABLE_NLS)
 
-IF (ENABLE_DEBUG)
-  SET(DEBUG_MEMORY 1)
-ENDIF(ENABLE_DEBUG)
-
 IF (ENABLE_BINRELOC)
   IF (UNIX OR MINGW)
     SET(BR_PTHREAD 1)
diff --git a/src/config.h.cmake.in b/src/config.h.cmake.in
index 0d0334b..e0e271c 100644
--- a/src/config.h.cmake.in
+++ b/src/config.h.cmake.in
@@ -7,9 +7,6 @@
 /* Include pthread support for binary relocation? */
 #cmakedefine BR_PTHREAD 1
 
-/* Enable debug memory */
-#cmakedefine01 DEBUG_MEMORY
-
 /* Use binary relocation? */
 #cmakedefine ENABLE_BINRELOC
 

commit 897fc841b6f74c555ba9847cf4146b63c3c41792
Author: Stefan Talpalaru <stefantalpalaru at yahoo.com>
Date:   Sat Jan 7 18:16:54 2017 +0100

    configure: fix --disable-debug, --disable-profile and --disable-locale-specific-tax

diff --git a/configure.ac b/configure.ac
index 2e13ce6..e03219f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -725,23 +725,26 @@ AC_SUBST(GNC_SCM_INSTALL_DIR)
 AC_SUBST(GNC_SHAREDIR)
 AC_SUBST(GNC_LIBEXECDIR)
 
+dnl is DEBUG_MEMORY still used somewhere?
 AC_ARG_ENABLE( debug,
   [AS_HELP_STRING([--enable-debug],[compile with debugging flags set])],
   [
+  if test x$enableval = xyes; then
      # remove any optimization flags...
      CFLAGS=`echo ${CFLAGS} | sed -e 's,-O.,,g'`
      # ...except for those the user wants.
      CFLAGS="${CFLAGS} -g ${USER_OPTIMIZATION}"
      LDFLAGS="${LDFLAGS} -g"
      AC_DEFINE(DEBUG_MEMORY,1,[Enable debug memory])
-  ],
-  [     AC_DEFINE(DEBUG_MEMORY,0,[Enable debug memory])
+  fi
   ])
 
 AC_ARG_ENABLE( profile,
   [AS_HELP_STRING([--enable-profile],[compile with profiling set])],
-  CFLAGS="${CFLAGS} -pg"
-  LDFLAGS="${LDFLAGS} -pg")
+  if test x$enableval = xyes; then
+    CFLAGS="${CFLAGS} -pg"
+    LDFLAGS="${LDFLAGS} -pg"
+  fi)
 
 ### --------------------------------------------------------------------------
 ### Register2
@@ -908,7 +911,11 @@ LANGINFO_D_FMT_CHECK
 dnl Enable locale-specific tax-related information in the accounts
 AC_ARG_ENABLE( locale-specific-tax,
   [AS_HELP_STRING([--enable-locale-specific-tax],[enable localized tax categories (experimental, but used by the german SKR04 account chart)])],
-  AC_DEFINE(LOCALE_SPECIFIC_TAX,1,Enable the experimental locale-specific tax categories) )
+  [
+  if test x$enableval = xyes; then
+    AC_DEFINE(LOCALE_SPECIFIC_TAX,1,Enable the experimental locale-specific tax categories)
+  fi
+  ])
 
 dnl Make sure we have a proper gettext installed
 AC_MSG_CHECKING(for a valid gettext/gmsgfmt installation)



Summary of changes:
 configure.ac               | 17 +++++++++++------
 src/CMakeLists.txt         |  4 ----
 src/config.h.cmake.in      |  3 ---
 src/engine/gnc-commodity.c |  4 ++--
 4 files changed, 13 insertions(+), 15 deletions(-)