From e6c0795652a5900bb7dcf17f831f0cd70732a2a8 Mon Sep 17 00:00:00 2001
From: Christian Stimming <stimming@tuhh.de>
Date: Fri, 23 Mar 2012 20:52:13 +0000
Subject: [PATCH] Fix r22105 that was missing some dependency of the "optional"
 directory on other parts.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22111 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 src/Makefile.am | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index f7e1d02a9b..5dada8c400 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,16 +13,15 @@ NONGUI_SUBDIRS = \
   quotes \
   tax
 
-# These directories should also not contain any gtk dependencies, but
-# currently there is only single very little dependency in
-# app-utils. It should go away in the long run, though.
 if WITH_PYTHON
    PYTHON_DIR = python
 endif
 
+# These directories should also not contain any gtk dependencies, but
+# currently there is only single very little dependency in
+# app-utils. It should go away in the long run, though.
 ALMOST_NONGUI_SUBDIRS = \
   app-utils \
-  optional \
   ${PYTHON_DIR}
 
 # These directories contain the code with gtk dependency
@@ -35,6 +34,7 @@ GUI_SUBDIRS = \
   gnome \
   import-export \
   business \
+  optional \
   plugins \
   bin
 
@@ -42,7 +42,10 @@ GUI_SUBDIRS = \
 if GNUCASH_ENABLE_GUI
 SUBDIRS = . $(NONGUI_SUBDIRS) $(ALMOST_NONGUI_SUBDIRS) $(GUI_SUBDIRS)
 else
-SUBDIRS = . $(NONGUI_SUBDIRS) $(ALMOST_NONGUI_SUBDIRS)
+# Note: In non-GUI build, "optional" needs to be added as well, but
+# cannot be added in the variable because in with-GUI mode it depends
+# on other parts.
+SUBDIRS = . $(NONGUI_SUBDIRS) $(ALMOST_NONGUI_SUBDIRS) optional
 endif
 
 noinst_HEADERS = \