Configure and detect app-utils module. Install public app-utils headers.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@5375 57a11ea4-9604-0410-9ed3-97b8803252fd

Makefile.am

@@ -74,7 +74,9 @@ gnucash-config: gnucash-config.in
 	sed < $@.in > $@.tmp \
             -e 's:@-VERSION-@:${VERSION}:g' \
             -e 's:@-GNUCASH_ENGINE_CFLAGS-@:${GNUCASH_ENGINE_CFLAGS}:g' \
-            -e 's:@-GNUCASH_ENGINE_LIBS-@:${GNUCASH_ENGINE_LIBS}:g'
+            -e 's:@-GNUCASH_ENGINE_LIBS-@:${GNUCASH_ENGINE_LIBS}:g' \
+            -e 's:@-GNUCASH_APP_UTILS_CFLAGS-@:${GNUCASH_APP_UTILS_CFLAGS}:g' \
+            -e 's:@-GNUCASH_APP_UTILS_LIBS-@:${GNUCASH_APP_UTILS_LIBS}:g'
 	chmod +x $@.tmp
 	mv $@.tmp $@
 

configure.in

@@ -138,6 +138,7 @@ fi
 
 GNC_ACCOUNTS_DIR=${GNC_SHAREDIR}/accounts
 GNC_GLADE_DIR=${GNC_SHAREDIR}/glade
+GNC_GWRAP_LIBDIR='${GNC_SHAREDIR}/guile-modules/g-wrapped'
 GNC_MODULE_DIR='${pkglibdir}'
 GNC_PIXMAP_DIR='${datadir}/pixmaps/gnucash'
 
@@ -145,6 +146,7 @@ AC_SUBST(GNC_ACCOUNTS_DIR)
 AC_SUBST(GNC_CONFIGDIR)
 AC_SUBST(GNC_DOC_INSTALL_DIR)
 AC_SUBST(GNC_GLADE_DIR)
+AC_SUBST(GNC_GWRAP_LIBDIR)
 AC_SUBST(GNC_INCLUDE_DIR)
 AC_SUBST(GNC_LIBDIR)
 AC_SUBST(GNC_MODULE_DIR)
@@ -635,7 +637,7 @@ CFLAGS="$GNC_OLDCFLAGS"
 ### GnuCash flags and libs configuration
 
 GNUCASH_ENGINE_BASE_LIBS="${GUILE_LIBS} ${GLIB_LIBS}"
-GNUCASH_ENGINE_LIBS="-L'${libdir}' -L${GNC_MODULE_DIR} ${GNUCASH_ENGINE_BASE_LIBS} -lgncmod-engine -lgncmodule"
+GNUCASH_ENGINE_LIBS="-L'${libdir}' -L${GNC_MODULE_DIR} -L${GNC_GWRAP_LIBDIR} ${GNUCASH_ENGINE_BASE_LIBS} -lgncmod-engine -lgw-engine -lgw-kvp -lgw-glib -lgncmodule"
 
 GNUCASH_ENGINE_BASE_CFLAGS="${GLIB_CFLAGS} ${G_WRAP_COMPILE_ARGS} ${GUILE_INCS}"
 GNUCASH_ENGINE_CFLAGS="-I${GNC_INCLUDE_DIR} ${GNUCASH_ENGINE_BASE_CFLAGS}"
@@ -645,6 +647,12 @@ AC_SUBST(GNUCASH_ENGINE_LIBS)
 AC_SUBST(GNUCASH_ENGINE_BASE_CFLAGS)
 AC_SUBST(GNUCASH_ENGINE_CFLAGS)
 
+GNUCASH_APP_UTILS_CFLAGS="${GNUCASH_ENGINE_CFLAGS}"
+GNUCASH_APP_UTILS_LIBS="${GNUCASH_ENGINE_LIBS} -lgncmod-calculation -lgncmod-app-utils"
+
+AC_SUBST(GNUCASH_APP_UTILS_CFLAGS)
+AC_SUBST(GNUCASH_APP_UTILS_LIBS)
+
 
 ### --------------------------------------------------------------------------
 ### Makefile creation

gnucash-config.in

@@ -16,6 +16,7 @@ Options:
 	[--cflags]
 Libraries:
 	engine
+        app-utils
         gnucash
 EOF
 	exit $1
@@ -64,6 +65,10 @@ while test $# -gt 0; do
       lib_engine=yes
       any_lib=yes
       ;;
+    app-utils)
+      lib_app_utils=yes
+      any_lib=yes
+      ;;
     gnucash)
       lib_gnucash=yes
       any_lib=yes
@@ -80,6 +85,15 @@ if test "$any_lib" = "no"; then
   lib_gnucash=yes
 fi
 
+if test "$lib_app_utils" = "yes"; then
+  lib_engine=no
+fi
+
+if test "$lib_gnucash" = "yes"; then
+  lib_engine=no
+  lib_app_utils=no
+fi
+
 if test "$echo_prefix" = "yes"; then
     echo $prefix
 fi
@@ -90,17 +104,28 @@ fi
 
 if test "$echo_cflags" = "yes"; then
     cflags=""
+
     if test "$lib_engine" = "yes"; then
         cflags="$cflags @-GNUCASH_ENGINE_CFLAGS-@"
     fi
 
+    if test "$lib_app_utils" = "yes"; then
+        cflags="$cflags @-GNUCASH_APP_UTILS_CFLAGS-@"
+    fi
+
     echo $cflags
 fi
 
 if test "$echo_libs" = "yes"; then
     libs=""
+
     if test "$lib_engine" = "yes"; then
         libs="$libs @-GNUCASH_ENGINE_LIBS-@"
     fi
+
+    if test "$lib_app_utils" = "yes"; then
+        libs="$libs @-GNUCASH_APP_UTILS_LIBS-@"
+    fi
+
     echo $libs
 fi

gnucash.m4

@@ -30,17 +30,11 @@ AC_ARG_ENABLE(gnucashtest, [  --disable-gnucashtest       Do not try to compile
      fi
   fi
 
-  for module in . $4
+  if test "x$4" = "x"; then
-  do
+     gnucash_config_args="$gnucash_config_args gnucash"
-      case "$module" in
+  else
-         engine)
+     gnucash_config_args="$gnucash_config_args $4"
-             gnucash_config_args="$gnucash_config_args engine"
+  fi
-         ;;
-         gnucash)
-             gnucash_config_args="$gnucash_config_args gnucash"
-         ;;
-      esac
-  done
 
   AC_PATH_PROG(GNUCASH_CONFIG, gnucash-config, no)
   min_gnucash_version=ifelse([$1], ,1.7.0,$1)

src/app-utils/Makefile.am

@@ -23,7 +23,8 @@ libgncmod_app_utils_la_SOURCES = \
   guile-util.c \
   option-util.c 
 
-noinst_HEADERS = \
+gncincludedir = ${GNC_INCLUDE_DIR}
+gncinclude_HEADERS = \
   gfec.h \
   global-options.h \
   gnc-component-manager.h \
@@ -42,13 +43,14 @@ libgncmod_app_utils_la_LIBADD = \
   -L../gnc-module -L../gnc-module/.libs -lgncmodule \
   -L../engine -L../engine/.libs -lgncmod-engine \
   -L../calculation -L../calculation/.libs -lgncmod-calculation \
-  ${GUILE_LIBS} ${GLIB_LIBS}
+  ${GUILE_LIBS} \
+  ${GLIB_LIBS}
 
-libgw_app_utils_la_SOURCES=gw-app-utils.c
+libgw_app_utils_la_SOURCES = gw-app-utils.c
-libgw_app_utils_la_LDFLAGS=-module
+libgw_app_utils_la_LDFLAGS = -module
 
-gncmoddir=${GNC_SHAREDIR}/guile-modules/gnucash
+gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
-gncmod_DATA=app-utils.scm 
+gncmod_DATA = app-utils.scm 
 
 gncscmdir = ${GNC_SHAREDIR}/scm
 gncscm_DATA = \
@@ -58,11 +60,11 @@ gncscm_DATA = \
   options.scm \
   utilities.scm
 
-gwmoddir=${GNC_SHAREDIR}/guile-modules/g-wrapped
+gwmoddir = ${GNC_GWRAP_LIBDIR}
-gwmod_LTLIBRARIES=libgw-app-utils.la
+gwmod_LTLIBRARIES = libgw-app-utils.la
-gwmod_DATA=gw-app-utils-spec.scm
+gwmod_DATA = gw-app-utils-spec.scm
 
-noinst_DATA=.scm-links
+noinst_DATA = .scm-links
 
 EXTRA_DIST = \
   ${gncmod_DATA} \

src/app-utils/gnc-ui-common.h

@@ -25,12 +25,16 @@
 #ifndef GNC_UI_COMMON_H
 #define GNC_UI_COMMON_H
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #if defined(GNOME)
   #include <gtk/gtk.h>
 #elif defined(MOTIF)
   #include <Xm/Xm.h>
+#else
+  **** No GUI selected ***
 #endif
 
 #if defined(GNOME)

src/engine/Makefile.am

@@ -100,9 +100,9 @@ gncscmdir=${GNC_SHAREDIR}/scm
 gncscm_DATA=commodity-table.scm engine-init.scm engine-interface.scm \
 engine-utilities.scm gnc-numeric.scm iso-4217-currencies.scm 
 
-gwmoddir=${GNC_SHAREDIR}/guile-modules/g-wrapped
+gwmoddir = ${GNC_GWRAP_LIBDIR}
-gwmod_LTLIBRARIES=libgw-glib.la libgw-engine.la libgw-kvp.la
+gwmod_LTLIBRARIES = libgw-glib.la libgw-engine.la libgw-kvp.la
-gwmod_DATA=gw-engine-spec.scm gw-glib-spec.scm gw-kvp-spec.scm
+gwmod_DATA = gw-engine-spec.scm gw-glib-spec.scm gw-kvp-spec.scm
 
 EXTRA_DIST = \
   .cvsignore \

src/gnc-module/Makefile.am

@@ -16,7 +16,7 @@ libgw_gnc_module_la_LDFLAGS = -module -L. -L.libs -lgncmodule
 gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
 gncmod_DATA = gnc-module.scm
 
-gwmoddir = ${GNC_SHAREDIR}/guile-modules/g-wrapped
+gwmoddir = ${GNC_GWRAP_LIBDIR}
 gwmod_LTLIBRARIES = libgw-gnc-module.la
 gwmod_DATA = gw-gnc-module-spec.scm 
 

src/register/register-gnome/table-gnome.c

@@ -49,6 +49,7 @@
 #include "gnucash-sheet.h"
 #include "gnucash-style.h"
 #include "table-allgui.h"
+#include "table-gnome.h"
 
 
 void