Configure network-utils and gnome-utils package and install

their public headers.


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

Makefile.am

@@ -78,7 +78,11 @@ gnucash-config: gnucash-config.in
             -e 's:@-GNUCASH_ENGINE_CFLAGS-@:${GNUCASH_ENGINE_CFLAGS}: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'
+            -e 's:@-GNUCASH_APP_UTILS_LIBS-@:${GNUCASH_APP_UTILS_LIBS}:g' \
+            -e 's:@-GNUCASH_NETWORK_UTILS_CFLAGS-@:${GNUCASH_NETWORK_UTILS_CFLAGS}:g' \
+            -e 's:@-GNUCASH_NETWORK_UTILS_LIBS-@:${GNUCASH_NETWORK_UTILS_LIBS}:g' \
+            -e 's:@-GNUCASH_GNOME_UTILS_CFLAGS-@:${GNUCASH_GNOME_UTILS_CFLAGS}:g' \
+            -e 's:@-GNUCASH_GNOME_UTILS_LIBS-@:${GNUCASH_GNOME_UTILS_LIBS}:g'
 	chmod +x $@.tmp
 	mv $@.tmp $@
 

configure.in

@@ -655,6 +655,18 @@ GNUCASH_APP_UTILS_LIBS="${GNUCASH_ENGINE_LIBS} -lgncmod-calculation -lgncmod-app
 AC_SUBST(GNUCASH_APP_UTILS_CFLAGS)
 AC_SUBST(GNUCASH_APP_UTILS_LIBS)
 
+GNUCASH_NETWORK_UTILS_CFLAGS="${GLIB_CFLAGS} ${GHTTP_CFLAGS} ${GNOME_INCLUDEDIR}"
+GNUCASH_NETWORK_UTILS_LIBS="${GHTTP_LIBS} ${GNOME_LIBDIR} ${GNOME_LIBS} ${GNOMEUI_LIBS} -lgncmod-network-utils"
+
+AC_SUBST(GNUCASH_NETWORK_UTILS_CFLAGS)
+AC_SUBST(GNUCASH_NETWORK_UTILS_LIBS)
+
+GNUCASH_GNOME_UTILS_CFLAGS="${GNUCASH_APP_UTILS_CFLAGS} ${GNUCASH_NETWORK_UTILS_CFLAGS} ${GNOME_PRINT_CFLAGS} ${GNOME_INCLUDEDIR} ${GUPPI_CFLAGS}"
+GNUCASH_GNOME_UTILS_LIBS="${GNUCASH_APP_UTILS_LIBS} ${GNUCASH_NETWORK_UTILS_LIBS} ${GNOME_LIBDIR} ${GNOMEUI_LIBS} ${GNOME_PRINT_LIBS} ${GTKHTML_LIBS} ${GLADE_LIBS} ${GUPPI_LIBS} -lgncmod-gnome-utils"
+
+AC_SUBST(GNUCASH_GNOME_UTILS_CFLAGS)
+AC_SUBST(GNUCASH_GNOME_UTILS_LIBS)
+
 
 ### --------------------------------------------------------------------------
 ### Makefile creation

gnucash-config.in

@@ -17,6 +17,8 @@ Options:
 Libraries:
 	engine
         app-utils
+        network-utils
+        gnome-utils
         gnucash
 EOF
 	exit $1
@@ -69,6 +71,14 @@ while test $# -gt 0; do
       lib_app_utils=yes
       any_lib=yes
       ;;
+    network-utils)
+      lib_network_utils=yes
+      any_lib=yes
+      ;;
+    gnome-utils)
+      lib_gnome_utils=yes
+      any_lib=yes
+      ;;
     gnucash)
       lib_gnucash=yes
       any_lib=yes
@@ -94,6 +104,12 @@ if test "$lib_gnucash" = "yes"; then
   lib_app_utils=no
 fi
 
+if test "$lib_gnome_utils" = "yes"; then
+  lib_engine=no
+  lib_app_utils=no
+  lib_network_utils=no
+fi
+
 if test "$echo_prefix" = "yes"; then
     echo $prefix
 fi
@@ -113,6 +129,14 @@ if test "$echo_cflags" = "yes"; then
         cflags="$cflags @-GNUCASH_APP_UTILS_CFLAGS-@"
     fi
 
+    if test "$lib_network_utils" = "yes"; then
+        cflags="$cflags @-GNUCASH_NETWORK_UTILS_CFLAGS-@"
+    fi
+
+    if test "$lib_gnome_utils" = "yes"; then
+        cflags="$cflags @-GNUCASH_GNOME_UTILS_CFLAGS-@"
+    fi
+
     echo $cflags
 fi
 
@@ -127,5 +151,13 @@ if test "$echo_libs" = "yes"; then
         libs="$libs @-GNUCASH_APP_UTILS_LIBS-@"
     fi
 
+    if test "$lib_network_utils" = "yes"; then
+        libs="$libs @-GNUCASH_NETWORK_UTILS_LIBS-@"
+    fi
+
+    if test "$lib_gnome_utils" = "yes"; then
+        libs="$libs @-GNUCASH_GNOME_UTILS_LIBS-@"
+    fi
+
     echo $libs
 fi

src/gnome-utils/Makefile.am

@@ -2,13 +2,11 @@ SUBDIRS = . test
 
 pkglib_LTLIBRARIES = libgncmod-gnome-utils.la
 
-CFLAGS = @CFLAGS@ ${GLIB_CFLAGS}
+CFLAGS = @CFLAGS@ ${GLIB_CFLAGS} ${GNOME_PRINT_CFLAGS}
 
 #FIXME remove the following deps
 #  -I${top_srcdir}/src \
 #  -I${top_srcdir}/src/gnome \
-#  -I${top_srcdir}/src/register/ledger-core \
-#  -I${top_srcdir}/src/register/register-core \
 
 INCLUDES = \
   -I${top_srcdir}/src/gnc-module \
@@ -17,8 +15,6 @@ INCLUDES = \
   -I${top_srcdir}/src/app-utils \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/gnome \
-  -I${top_srcdir}/src/register/ledger-core \
-  -I${top_srcdir}/src/register/register-core \
   ${GNOME_INCLUDEDIR} \
   ${GUILE_INCS} \
   ${GUPPI_CFLAGS}
@@ -45,7 +41,8 @@ libgncmod_gnome_utils_la_SOURCES = \
   gtkselect.c \
   print-session.c
 
-noinst_HEADERS = \
+gncincludedir = ${GNC_INCLUDE_DIR}
+gncinclude_HEADERS = \
   dialog-commodity.h \
   dialog-utils.h \
   druid-utils.h \
@@ -55,7 +52,6 @@ noinst_HEADERS = \
   gnc-currency-edit.h \
   gnc-date-delta.h \
   gnc-date-edit.h \
-  gnc-dir.h \
   gnc-frequency.h \
   gnc-gui-query.h \
   gnc-html-history.h \
@@ -65,6 +61,9 @@ noinst_HEADERS = \
   gtkselect.h \
   print-session.h
 
+noinst_HEADERS = \
+  gnc-dir.h
+
 libgncmod_gnome_utils_la_LDFLAGS = -module
 
 libgncmod_gnome_utils_la_LIBADD = \

src/gnome-utils/dialog-utils.c

@@ -27,8 +27,6 @@
 #include <glade/glade.h>
 #include <gnome.h>
 
-#include "basiccell.h"       /* FIXME: remove when multi-byte functions
-                                are in app-utils, (or just glib) */
 #include "dialog-utils.h"
 #include "global-options.h"
 #include "gnc-commodity.h"

src/network-utils/Makefile.am

@@ -15,7 +15,8 @@ libgncmod_network_utils_la_SOURCES = \
   gnc-http.c \
   gncmod-network-utils.c
 
-noinst_HEADERS = \
+gncincludedir = ${GNC_INCLUDE_DIR}
+gncinclude_HEADERS = \
   gnc-gpg.h \
   gnc-http.h