--- a/trunk/acinclude.m4
+++ b/trunk/acinclude.m4
@@ -237,6 +237,8 @@
 	AM_CONDITIONAL([BUILD_THREADSEARCH], [false])
 	AM_CONDITIONAL([BUILD_VALGRIND], [false])
 	AM_CONDITIONAL([BUILD_WXSMITH], [false])
+	AM_CONDITIONAL([BUILD_WXSMITHCONTRIB], [false])
+	AM_CONDITIONAL([BUILD_WXSMITHAUI], [false])
 	AM_CONDITIONAL([BUILD_HEXEDITOR], [false])
 	AM_CONDITIONAL([BUILD_INCSEARCH], [false])
 ])
@@ -262,6 +264,8 @@
 	AM_CONDITIONAL([BUILD_THREADSEARCH], [true])
 	AM_CONDITIONAL([BUILD_VALGRIND], [true])
 	AM_CONDITIONAL([BUILD_WXSMITH], [true])
+	AM_CONDITIONAL([BUILD_WXSMITHCONTRIB], [true])
+	AM_CONDITIONAL([BUILD_WXSMITHAUI], [true])
 	AM_CONDITIONAL([BUILD_HEXEDITOR], [true])
 	AM_CONDITIONAL([BUILD_INCSEARCH], [true])
 ])
@@ -278,8 +282,8 @@
   [                        By default, no contrib plugins are compiled ]
   [                        Plugin names are: AutoVersioning,BrowseTracker,byogames,cbkoders,codesnippets,]
   [                        		     codestat,copystrings, dragscroll,envvars,headerfixup ]
-  [                        		     help,keybinder,libfinder,profiler, ]
-  [                        		     regex,exporter,symtab,wxsmith,incsearch,hexeditor ],
+  [                        		     help,keybinder,libfinder,profiler,regex,exporter, ]
+  [                        		     symtab,wxsmith,wxsmithcontrib,wxsmithaui,incsearch,hexeditor ],
   plugins="$withval", plugins="none")
 
 plugins=`echo $plugins | sed 's/,/ /g'`
@@ -349,6 +353,12 @@
 	wxsmith)
 		AM_CONDITIONAL([BUILD_WXSMITH], [true])
 		;;
+	wxsmithcontrib)
+		AM_CONDITIONAL([BUILD_WXSMITHCONTRIB], [true])
+		;;
+	wxsmithaui)
+		AM_CONDITIONAL([BUILD_WXSMITHAUI], [true])
+		;;
 	hexeditor)
 		AM_CONDITIONAL([BUILD_HEXEDITOR], [true])
 		;;
@@ -414,6 +424,12 @@
 		;;
 	-wxsmith)
 		AM_CONDITIONAL([BUILD_WXSMITH], [false])
+		;;
+	-wxsmithcontrib)
+		AM_CONDITIONAL([BUILD_WXSMITHCONTRIB], [false])
+		;;
+	-wxsmithaui)
+		AM_CONDITIONAL([BUILD_WXSMITHAUI], [false])
 		;;
 	-hexeditor)
 		AM_CONDITIONAL([BUILD_HEXEDITOR], [false])
@@ -449,6 +465,8 @@
 AC_SUBST(BUILD_THREADSEARCH)
 AC_SUBST(BUILD_VALGRIND)
 AC_SUBST(BUILD_WXSMITH)
+AC_SUBST(BUILD_WXSMITHCONTRIB)
+AC_SUBST(BUILD_WXSMITHAUI)
 AC_SUBST(BUILD_HEXEDITOR)
 AC_SUBST(BUILD_INCSEARCH)