fix unicode build errors with 10.3

[wxWidgets.git] / configure

diff --git a/configure b/configure
index fea675ec90739c2cf447929f4b68d88510b64453..afafcc195a9f8e30969da41aea3230b384081d0e 100755 (executable)
--- a/configure
+++ b/configure
@@ -36705,12 +36705,18 @@ fi
 
 USE_XRC=0
 if test "$wxUSE_XRC" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
+    if test "$wxUSE_XML" != "yes"; then
+        { echo "$as_me:$LINENO: WARNING: XML library not built, XRC resources disabled" >&5
+echo "$as_me: WARNING: XML library not built, XRC resources disabled" >&2;}
+        wxUSE_XRC=no
+    else
+        cat >>confdefs.h <<\_ACEOF
 #define wxUSE_XRC 1
 _ACEOF
 
-    USE_XRC=1
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS xrc"
+        USE_XRC=1
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS xrc"
+    fi
 fi
 
 if test "$wxUSE_MENUS" = "yes"; then
@@ -40902,15 +40908,10 @@ fi
                    "
 
 
+          ac_config_links="$ac_config_links include/wx-$WX_RELEASE$WX_FLAVOUR:include"
 
-for c in `ls $srcdir/contrib/include/wx 2> /dev/null`; do
-              ac_config_links="$ac_config_links include/wx-$WX_RELEASE$WX_FLAVOUR/wx/$c:contrib/include/wx/$c"
+          ac_config_links="$ac_config_links contrib/include"
 
-done
-for f in `ls $srcdir/include/wx 2> /dev/null`; do
-              ac_config_links="$ac_config_links include/wx-$WX_RELEASE$WX_FLAVOUR/wx/$f:include/wx/$f"
-
-done
 
 
 if test "$wxUSE_GUI" = "yes"; then
@@ -41624,8 +41625,8 @@ do
   "version-script" ) CONFIG_FILES="$CONFIG_FILES version-script" ;;
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "$mk" ) CONFIG_FILES="$CONFIG_FILES $mk" ;;
-  "include/wx-$WX_RELEASE$WX_FLAVOUR/wx/$c" ) CONFIG_LINKS="$CONFIG_LINKS include/wx-$WX_RELEASE$WX_FLAVOUR/wx/$c:contrib/include/wx/$c" ;;
-  "include/wx-$WX_RELEASE$WX_FLAVOUR/wx/$f" ) CONFIG_LINKS="$CONFIG_LINKS include/wx-$WX_RELEASE$WX_FLAVOUR/wx/$f:include/wx/$f" ;;
+  "include/wx-$WX_RELEASE$WX_FLAVOUR" ) CONFIG_LINKS="$CONFIG_LINKS include/wx-$WX_RELEASE$WX_FLAVOUR:include" ;;
+  "contrib/include" ) CONFIG_LINKS="$CONFIG_LINKS contrib/include" ;;
   "wx-config" ) CONFIG_COMMANDS="$CONFIG_COMMANDS wx-config" ;;
   "lib/wx/include/${TOOLCHAIN_FULLNAME}/wx/setup.h" ) CONFIG_HEADERS="$CONFIG_HEADERS lib/wx/include/${TOOLCHAIN_FULLNAME}/wx/setup.h:setup.h.in" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5