r20311 - gnucash/trunk - Revert r20310, "Add optional module that compiles with gtkmm..." - the configure code wasn't taking this as optional for whatever reason.

[Christian Stimming]

Author: cstim
Date: 2011-02-17 13:43:43 -0500 (Thu, 17 Feb 2011)
New Revision: 20311
Trac: http://svn.gnucash.org/trac/changeset/20311

Modified:
   gnucash/trunk/configure.ac
   gnucash/trunk/src/bin/gnucash-bin.c
   gnucash/trunk/src/optional/Makefile.am
Log:
Revert r20310, "Add optional module that compiles with gtkmm..." - the configure code wasn't taking this as optional for whatever reason.

Modified: gnucash/trunk/configure.ac
===================================================================
--- gnucash/trunk/configure.ac	2011-02-16 21:39:54 UTC (rev 20310)
+++ gnucash/trunk/configure.ac	2011-02-17 18:43:43 UTC (rev 20311)
@@ -1259,30 +1259,6 @@
 AC_SUBST(LC_MESSAGES_ENUM)
 
 ###--------------------------------------------------------
-### Make gtkmm plugin optional
-###--------------------------------------------------------
-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]
-  )
-if test x${enable_gtkmm} = "xtrue"
-then
-  GTKMM_DIR=gtkmm
-  # We require gtkmm, of course
-  PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 >= 2.16)
-  # and also the c++ compiler
-  AC_PROG_CXX
-  AC_PROG_CXXCPP
-fi
-AC_SUBST(GTKMM_DIR)
-
-###--------------------------------------------------------
 ### Make Python bindings optional
 ###--------------------------------------------------------
 enable_python=false
@@ -1496,7 +1472,6 @@
   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-16 21:39:54 UTC (rev 20310)
+++ gnucash/trunk/src/bin/gnucash-bin.c	2011-02-17 18:43:43 UTC (rev 20311)
@@ -576,8 +576,7 @@
         { "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/gtkmm", 0, TRUE },
+        { "gnucash/business-gnome", 0, TRUE }
     };
 
     /* module initializations go here */

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