Re-enable ugly hack, and only use AC_CONFIG_SUBDIRS if we have gettext

svn path=/trunk/mono/; revision=113219

Makefile.am

@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I .
 
-SUBDIRS = po/mcs $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) support docs data runtime scripts man samples web msvc
+SUBDIRS = $(po_dirs) $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) support docs data runtime scripts man samples web msvc
 
 # Keep in sync with SUBDIRS
 ## 'tools' is not normally built

configure.in

@@ -389,6 +389,14 @@ fi
 # we do not configure the full gettext, as we consume it dynamically from C#
 AM_PO_SUBDIRS
 
+po_dirs=po/mcs
+if grep -q '@GETTEXT_MACRO''_VERSION@' $0; then
+	po_dirs=
+else 
+        AC_CONFIG_SUBDIRS(po/mcs)
+fi
+AC_SUBST(po_dirs)
+
 AC_ARG_WITH([libgdiplus], 
 	[  --with-libgdiplus=installed|sibling|<path>	Override the libgdiplus used for System.Drawing tests (defaults to NO)], 
 	[], [with_libgdiplus=installed])