Do not build terminal by default

INSTALL

@@ -44,15 +44,8 @@ configure has the following medit-specific options:
     or if installed version of the library doesn't have unicode support (this is
     the case with default FreeBSD port), included copy will be built.
 
-  The following four options control components of libmoo which get built. Only
-  --without-mooterm may be used with medit, since it uses all other components.
-  By using --without-mooterm you will save a bit of compilation time and binary
-  size (and builtin terminal will not be available then).
-
-  --without-mooapp        disable building mooapp
-  --without-mooedit       disable building mooedit
-  --without-mooutils      disable building mooutils
-  --without-mooterm       disable building mooterm
+  --with-mooterm          whether to build terminal
+    Use this option if you want builtin terminal (it also requires python).
 
 Defaults for all the options are chosen in such a way that you do not need to
 use them. Only in case of problem they may be needed.

configure.ac

@@ -17,7 +17,7 @@ AC_CANONICAL_HOST
 AC_CONFIG_HEADERS(config.h)
 MOO_DEFINE_VERSIONS
 
-MOO_AC_I18N(moo, [])
+MOO_AC_I18N(moo, [ru])
 
 #  Check operating system
 MOO_AC_CHECK_OS
@@ -66,7 +66,7 @@ MOO_AC_PCRE
 
 MOO_SRC_PREFIX="moo"
 AC_SUBST(MOO_SRC_PREFIX)
-MOO_COMPONENTS
+MOO_COMPONENTS(term)
 MOO_AC_RELOC
 MOO_AC_SET_DIRS(moo)
 MOO_AC_FLAGS(moo)

m4/moo-comps.m4

@@ -1,27 +1,17 @@
 ##############################################################################
-# MOO_COMPONENTS()
+# MOO_COMPONENTS(optional-components)
 #
 AC_DEFUN([MOO_COMPONENTS],[
-    AC_ARG_WITH([mooapp],
-        AC_HELP_STRING([--without-mooapp], [disable building mooapp]),
-        [build_mooapp=$withval],
-        [build_mooapp=yes]
-    )
-    AC_ARG_WITH([mooedit],
-        AC_HELP_STRING([--without-mooedit], [disable building mooedit]),
-        [build_mooedit=$withval],
-        [build_mooedit=yes]
-    )
-    AC_ARG_WITH([mooutils],
-        AC_HELP_STRING([--without-mooutils], [disable building mooutils]),
-        [build_mooutils=$withval],
-        [build_mooutils=yes]
-    )
-    AC_ARG_WITH([mooterm],
-        AC_HELP_STRING([--without-mooterm], [disable building mooterm]),
-        [build_mooterm=$withval],
-        [build_mooterm=yes]
-    )
+  m4_foreach([comp], [utils, edit, term, app],
+  [build_moo[]comp=yes
+  ])
+
+  m4_foreach([name], $1,
+  [AC_ARG_WITH([name],
+    AC_HELP_STRING([--with-moo[]name], [enable moo[]name component (default = NO)]),
+        [build_moo[]name=$withval],
+        [build_moo[]name=no]
+  )])
 
   if test x$MOO_OS_CYGWIN = "xyes"; then
     build_mooutils="no"
@@ -39,43 +29,20 @@ AC_DEFUN([MOO_COMPONENTS],[
     build_mooutils="yes"
   fi
 
-    AM_CONDITIONAL(MOO_BUILD_UTILS,     test "x$build_mooutils"  != "xno")
-    AM_CONDITIONAL(MOO_BUILD_EDIT,      test "x$build_mooedit"   != "xno")
-    AM_CONDITIONAL(MOO_BUILD_TERM,      test "x$build_mooterm"   != "xno")
-    AM_CONDITIONAL(MOO_BUILD_APP,       test "x$build_mooapp"    != "xno")
-
-    MOO_BUILD_UTILS=0
-    MOO_BUILD_EDIT=0
-    MOO_BUILD_TERM=0
-    MOO_BUILD_APP=0
   MOO_BUILD_COMPS=
 
-    if test "x$build_mooutils" != "xno"; then
-        AC_DEFINE(MOO_BUILD_UTILS,, [build mooutils])
-        MOO_BUILD_UTILS=1
-        MOO_BUILD_COMPS="mooutils $MOO_BUILD_COMPS"
+  m4_foreach([comp], [utils, edit, term, app],[
+    AM_CONDITIONAL(MOO_BUILD_[]m4_toupper(comp), test "x$build_moo[]comp" != "xno")
+    MOO_BUILD_[]m4_toupper(comp)=0
+    if test "x$build_moo[]comp" != "xno"; then
+      AC_DEFINE(MOO_BUILD_[]m4_toupper(comp), [1], [build moo]comp)
+      MOO_BUILD_[]m4_toupper(comp)=1
+      MOO_BUILD_COMPS="moo[]comp $MOO_BUILD_COMPS"
     fi
-    if test "x$build_mooedit" != "xno"; then
-        AC_DEFINE(MOO_BUILD_EDIT,, [build mooedit])
-        MOO_BUILD_EDIT=1
-        MOO_BUILD_COMPS="mooedit $MOO_BUILD_COMPS"
-    fi
-    if test "x$build_mooterm" != "xno"; then
-        AC_DEFINE(MOO_BUILD_TERM,, [build mooterm])
-        MOO_BUILD_TERM=1
-        if test "x$MOO_OS_BSD" = "xyes"; then
+    AC_SUBST(MOO_BUILD_[]m4_toupper(comp))
+  ])
+
+  if test "x$build_mooterm" != "xno" -a "x$MOO_OS_BSD" = "xyes"; then
     MOO_LIBS="-lutil $MOO_LIBS"
   fi
-        MOO_BUILD_COMPS="mooterm $MOO_BUILD_COMPS"
-    fi
-    if test "x$build_mooapp" != "xno"; then
-        AC_DEFINE(MOO_BUILD_APP,, [build mooapp])
-        MOO_BUILD_APP=1
-        MOO_BUILD_COMPS="mooapp $MOO_BUILD_COMPS"
-    fi
-
-    AC_SUBST(MOO_BUILD_UTILS)
-    AC_SUBST(MOO_BUILD_EDIT)
-    AC_SUBST(MOO_BUILD_TERM)
-    AC_SUBST(MOO_BUILD_APP)
 ])

m4/moo-pygtk.m4

@@ -2,7 +2,7 @@
 # _MOO_AC_PYGTK_CODEGEN
 #
 AC_DEFUN([_MOO_AC_PYGTK_CODEGEN],[
-    AC_ARG_WITH([custom-codegen], AC_HELP_STRING([--with-custom-codegen], [whether to use custom copy of pygtk codegen (default = yes)]),[
+    AC_ARG_WITH([custom-codegen], AC_HELP_STRING([--with-custom-codegen], [whether to use custom copy of pygtk codegen (default = YES)]),[
         if test x$with_custom_codegen = "xno"; then
             MOO_USE_CUSTOM_CODEGEN="no"
             AC_MSG_NOTICE([using installed codegen])

moo.mprj

@@ -11,6 +11,9 @@
     </vars>
    </configure>
   </debug>
+  <mingw>
+   <build_dir>build/mingw</build_dir>
+  </mingw>
   <optimized>
    <build_dir>build/optimized</build_dir>
    <configure>