fixed wxUSE_3rdpartylib definitions for --without-3rdparty lib (patch 1103276)

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

diff --git a/configure b/configure
index 1c514ec5a31384c6f7574affef3176771774540b..ae2b44d4199722f559e5db636a6b5e18a2b2bdf5 100755 (executable)
--- a/configure
+++ b/configure
@@ -20819,6 +20819,11 @@ _ACEOF
 
         fi
     fi
 
         fi
     fi

+else
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_REGEX 0
+_ACEOF
+

 fi
 
 
 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
                         wxUSE_ZLIB=sys
         fi
     fi

+else
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_ZLIB 0
+_ACEOF
+

 fi
 
 
 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"
     fi
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"

+else
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_LIBPNG 0
+_ACEOF
+

 fi
 
 
 fi
 
 


@@ -21586,6 +21601,11 @@ echo "$as_me: WARNING: system jpeg library not found, will use built-in instead"
             fi
         fi
     fi
             fi
         fi
     fi

+else
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_LIBJPEG 0
+_ACEOF
+

 fi
 
 
 fi
 
 


@@ -21829,6 +21849,11 @@ echo "$as_me: WARNING: system tiff library not found, will use built-in instead"
                         wxUSE_LIBTIFF=sys
         fi
     fi
                         wxUSE_LIBTIFF=sys
         fi
     fi

+else
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_LIBTIFF 0
+_ACEOF
+

 fi
 
 
 fi
 
 


@@ -22146,12 +22171,20 @@ echo "$as_me: WARNING: system expat library not found, will use built-in instead
 subdirs="$subdirs src/expat"
 
     fi
 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
 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
     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
     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
 
 #define wxUSE_LIBMSPACK 1
 _ACEOF
 

-    fi
+else
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_LIBMSPACK 0
+_ACEOF
+

 fi
 
 
 fi
 
 

diff --git a/configure.in b/configure.in
index 1c4ddd880beea54b915431e05a835050e9f38666..428278bb376bd75c1bb44c9bf9d067ef7ff60bea 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2081,6 +2081,8 @@ if test "$wxUSE_REGEX" != "no"; then
             AC_DEFINE(WX_NO_REGEX_ADVANCED)
         fi
     fi
             AC_DEFINE(WX_NO_REGEX_ADVANCED)
         fi
     fi

+else
+    AC_DEFINE(wxUSE_REGEX, 0)

 fi
 
 dnl ------------------------------------------------------------------------
 fi
 
 dnl ------------------------------------------------------------------------


@@ -2154,6 +2156,8 @@ if test "$wxUSE_ZLIB" != "no" ; then
             wxUSE_ZLIB=sys
         fi
     fi
             wxUSE_ZLIB=sys
         fi
     fi

+else
+    AC_DEFINE(wxUSE_ZLIB, 0)

 fi
 
 dnl ------------------------------------------------------------------------
 fi
 
 dnl ------------------------------------------------------------------------


@@ -2225,6 +2229,8 @@ if test "$wxUSE_LIBPNG" != "no" ; then
     fi
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"
     fi
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"

+else
+    AC_DEFINE(wxUSE_LIBPNG, 0)

 fi
 
 dnl ------------------------------------------------------------------------
 fi
 
 dnl ------------------------------------------------------------------------


@@ -2279,6 +2285,8 @@ if test "$wxUSE_LIBJPEG" != "no" ; then
             fi
         fi
     fi
             fi
         fi
     fi

+else
+    AC_DEFINE(wxUSE_LIBJPEG, 0)

 fi
 
 dnl ------------------------------------------------------------------------
 fi
 
 dnl ------------------------------------------------------------------------


@@ -2320,6 +2328,8 @@ if test "$wxUSE_LIBTIFF" != "no" ; then
             wxUSE_LIBTIFF=sys
         fi
     fi
             wxUSE_LIBTIFF=sys
         fi
     fi

+else
+    AC_DEFINE(wxUSE_LIBTIFF, 0)

 fi
 
 dnl ------------------------------------------------------------------------
 fi
 
 dnl ------------------------------------------------------------------------


@@ -2367,6 +2377,9 @@ if test "$wxUSE_EXPAT" != "no"; then
         dnl Expat needs this:
         AC_CONFIG_SUBDIRS([src/expat])
     fi
         dnl Expat needs this:
         AC_CONFIG_SUBDIRS([src/expat])
     fi

+else
+    AC_DEFINE(wxUSE_EXPAT, 0)
+    AC_DEFINE(wxUSE_XML, 0)

 fi
 
 
 fi
 
 


@@ -2375,7 +2388,6 @@ dnl Check for libmspack
 dnl ------------------------------------------------------------------------
 
 if test "$wxUSE_LIBMSPACK" != "no"; then
 dnl ------------------------------------------------------------------------
 
 if test "$wxUSE_LIBMSPACK" != "no"; then

-    

     AC_CHECK_HEADER([mspack.h], [found_mspack_h=1])
     if test "x$found_mspack_h" = "x1"; then
         AC_CHECK_LIB(mspack, mspack_create_chm_decompressor,
     AC_CHECK_HEADER([mspack.h], [found_mspack_h=1])
     if test "x$found_mspack_h" = "x1"; then
         AC_CHECK_LIB(mspack, mspack_create_chm_decompressor,


@@ -2383,11 +2395,15 @@ if test "$wxUSE_LIBMSPACK" != "no"; then
     fi
     if test "x$MSPACK_LINK" = "x" ; then
         wxUSE_LIBMSPACK=no
     fi
     if test "x$MSPACK_LINK" = "x" ; then
         wxUSE_LIBMSPACK=no

-    else
-        AC_DEFINE(wxUSE_LIBMSPACK)

     fi
 fi
 
     fi
 fi
 

+if test "$wxUSE_LIBMSPACK" != "no"; then
+    AC_DEFINE(wxUSE_LIBMSPACK)
+else
+    AC_DEFINE(wxUSE_LIBMSPACK, 0)
+fi
+

 
 dnl ----------------------------------------------------------------
 dnl search for toolkit (widget sets)
 
 dnl ----------------------------------------------------------------
 dnl search for toolkit (widget sets)