r20312 - gnucash/trunk - Re-apply r20310: Add optional module that compiles with gtkmm.

[Christian Stimming]

Author: cstim
Date: 2011-02-18 04:37:24 -0500 (Fri, 18 Feb 2011)
New Revision: 20312
Trac: http://svn.gnucash.org/trac/changeset/20312

Modified:
   gnucash/trunk/configure.ac
   gnucash/trunk/src/bin/gnucash-bin.c
   gnucash/trunk/src/optional/Makefile.am
Log:
Re-apply r20310: Add optional module that compiles with gtkmm.

Modified: gnucash/trunk/configure.ac
===================================================================
--- gnucash/trunk/configure.ac	2011-02-17 18:43:43 UTC (rev 20311)
+++ gnucash/trunk/configure.ac	2011-02-18 09:37:24 UTC (rev 20312)
@@ -109,6 +109,35 @@
 
 AC_PROG_INSTALL
 
+
+###--------------------------------------------------------
+### Optionally enable gtkmm plugin (requires c++ compiler)
+###--------------------------------------------------------
+enable_gtkmm=false
+
+AC_ARG_ENABLE(gtkmm,
+  [AS_HELP_STRING([--enable-gtkmm],[enable gtkmm gui])]
+  [case "${enableval}" in
+     yes) enable_gtkmm=true ;;
+     no) enable_gtkmm=false ;;
+     *) enable_gtkmm=true ;;
+   esac]
+  )
+AS_IF([test x${enable_gtkmm} = "xyes"],
+  [
+    GTKMM_DIR=gtkmm
+    # We require gtkmm, of course
+    PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 >= 2.16)
+    # and also the c++ compiler
+    AC_PROG_CXXCPP
+    AC_PROG_CXX
+  ])
+AC_SUBST(GTKMM_DIR)
+# This section must come before AC_PROG_LIBTOOL because libtool
+# must know about the c++ compiler.
+###--------------------------------------------------------
+
+
 AC_LIBTOOL_DLOPEN
 AC_LIBTOOL_WIN32_DLL
 AM_DISABLE_STATIC
@@ -1472,6 +1501,7 @@
   src/libqof/qof/Makefile
   src/libqof/qof/test/Makefile
   src/optional/Makefile
+  src/optional/gtkmm/Makefile
   src/optional/python-bindings/Makefile
   src/optional/python-bindings/tests/Makefile
   src/pixmaps/Makefile

Modified: gnucash/trunk/src/bin/gnucash-bin.c
===================================================================
--- gnucash/trunk/src/bin/gnucash-bin.c	2011-02-17 18:43:43 UTC (rev 20311)
+++ gnucash/trunk/src/bin/gnucash-bin.c	2011-02-18 09:37:24 UTC (rev 20312)
@@ -576,7 +576,8 @@
         { "gnucash/report/utility-reports", 0, FALSE },
         { "gnucash/report/locale-specific/us", 0, FALSE },
         { "gnucash/report/report-gnome", 0, FALSE },
-        { "gnucash/business-gnome", 0, TRUE }
+        { "gnucash/business-gnome", 0, TRUE },
+        { "gnucash/gtkmm", 0, TRUE },
     };
 
     /* module initializations go here */

Modified: gnucash/trunk/src/optional/Makefile.am
===================================================================
--- gnucash/trunk/src/optional/Makefile.am	2011-02-17 18:43:43 UTC (rev 20311)
+++ gnucash/trunk/src/optional/Makefile.am	2011-02-18 09:37:24 UTC (rev 20312)
@@ -1,2 +1,2 @@
-SUBDIRS = ${PYTHON_DIR}
-DIST_SUBDIRS = python-bindings
+SUBDIRS = ${PYTHON_DIR} ${GTKMM_DIR}
+DIST_SUBDIRS = python-bindings gtkmm