catch a few more defines, which were not of the wxUSE_XXX form, and set them to 0...

[wxWidgets.git] / configure

diff --git a/configure b/configure
index 39e35286c25475c193c405413317feab559a6db3..ae2b44d4199722f559e5db636a6b5e18a2b2bdf5 100755 (executable)
--- a/configure
+++ b/configure
@@ -20819,6 +20819,11 @@ _ACEOF
 
         fi
     fi
+else
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_REGEX 0
+_ACEOF
+
 fi
 
 
@@ -21117,6 +21122,11 @@ echo "$as_me: WARNING: zlib library not found or too old, will use built-in inst
                         wxUSE_ZLIB=sys
         fi
     fi
+else
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_ZLIB 0
+_ACEOF
+
 fi
 
 
@@ -21422,6 +21432,11 @@ echo "$as_me: WARNING: system png library not found or too old, will use built-i
     fi
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"
+else
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_LIBPNG 0
+_ACEOF
+
 fi
 
 
@@ -21586,6 +21601,11 @@ echo "$as_me: WARNING: system jpeg library not found, will use built-in instead"
             fi
         fi
     fi
+else
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_LIBJPEG 0
+_ACEOF
+
 fi
 
 
@@ -21829,6 +21849,11 @@ echo "$as_me: WARNING: system tiff library not found, will use built-in instead"
                         wxUSE_LIBTIFF=sys
         fi
     fi
+else
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_LIBTIFF 0
+_ACEOF
+
 fi
 
 
@@ -22146,12 +22171,20 @@ echo "$as_me: WARNING: system expat library not found, will use built-in instead
 subdirs="$subdirs src/expat"
 
     fi
+else
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_EXPAT 0
+_ACEOF
+
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_XML 0
+_ACEOF
+
 fi
 
 
 
 if test "$wxUSE_LIBMSPACK" != "no"; then
-
     if test "${ac_cv_header_mspack_h+set}" = set; then
   echo "$as_me:$LINENO: checking for mspack.h" >&5
 echo $ECHO_N "checking for mspack.h... $ECHO_C" >&6
@@ -22364,12 +22397,19 @@ fi
     fi
     if test "x$MSPACK_LINK" = "x" ; then
         wxUSE_LIBMSPACK=no
-    else
-        cat >>confdefs.h <<\_ACEOF
+    fi
+fi
+
+if test "$wxUSE_LIBMSPACK" != "no"; then
+    cat >>confdefs.h <<\_ACEOF
 #define wxUSE_LIBMSPACK 1
 _ACEOF
 
-    fi
+else
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_LIBMSPACK 0
+_ACEOF
+
 fi
 
 
@@ -33543,14 +33583,14 @@ fi
 
 
 if test "$wxUSE_GUI" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
+    cat >>confdefs.h <<\_ACEOF
 #define wxUSE_GUI 1
 _ACEOF
 
 
-                      else
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_NOGUI 1
+                                            else
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_GUI 0
 _ACEOF
 
 fi