XRC needs wxXML, check it

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29271 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

configure.in

@@ -5514,9 +5514,14 @@ fi
 
 USE_XRC=0
 if test "$wxUSE_XRC" = "yes"; then
-    AC_DEFINE(wxUSE_XRC)
+    if test "$wxUSE_XML" != "yes"; then
-    USE_XRC=1
+        AC_MSG_WARN([XML library not built, XRC resources disabled])
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS xrc"
+        wxUSE_XRC=no
+    else
+        AC_DEFINE(wxUSE_XRC)
+        USE_XRC=1
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS xrc"
+    fi
 fi
 
 if test "$wxUSE_MENUS" = "yes"; then

include/wx/chkconf.h

@@ -411,6 +411,14 @@
 #   endif
 #endif /* !defined(wxUSE_HTML) */
 
+#ifndef wxUSE_XRC
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_XRC must be defined."
+#   else
+#       define wxUSE_XRC 0
+#   endif
+#endif /* !defined(wxUSE_XRC) */
+
 #ifndef wxUSE_LIBMSPACK
 #   ifndef __UNIX__
         /* set to 0 on platforms that don't have libmspack */
@@ -1574,5 +1582,14 @@
 #   endif
 #endif /* wxUSE_WX_RESOURCES */
 
+#if wxUSE_XRC && !wxUSE_XML
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_XRC requires wxUSE_XML"
+#   else
+#       undef wxUSE_XRC
+#       define wxUSE_XRC 0
+#   endif
+#endif /* wxUSE_UNICODE_XRC */
+
 #endif /* wxUSE_GUI */