X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4ca8f7ce2fef648a35cb036cb88ab7ed2b529a79..5b526f4b85cd56f606db0a4f39b68ea2fad86076:/configure

diff --git a/configure b/configure
index 5447d0caac..ccdb05d259 100755
--- a/configure
+++ b/configure
@@ -675,12 +675,6 @@ COND_wxUSE_LIBTIFF_builtin
 COND_wxUSE_LIBPNG_builtin
 COND_wxUSE_LIBJPEG_builtin
 COND_wxUSE_EXPAT_builtin
-COND_WXUSE_ZLIB_BUILTIN
-COND_WXUSE_REGEX_BUILTIN
-COND_WXUSE_LIBTIFF_BUILTIN
-COND_WXUSE_LIBPNG_BUILTIN
-COND_WXUSE_LIBJPEG_BUILTIN
-COND_WXUSE_EXPAT_BUILTIN
 COND_WXUNIV_1
 COND_WXUNIV_0
 COND_WITH_PLUGIN_SDL_1
@@ -703,9 +697,6 @@ COND_USE_OPENGL_1
 COND_USE_GUI_1_wxUSE_LIBTIFF_builtin
 COND_USE_GUI_1_wxUSE_LIBPNG_builtin
 COND_USE_GUI_1_wxUSE_LIBJPEG_builtin
-COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN
-COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN
-COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN
 COND_USE_GUI_1_WXUNIV_1
 COND_USE_GUI_1_WXUNIV_0
 COND_USE_GUI_1_USE_OPENGL_1
@@ -795,7 +786,6 @@ COND_PLATFORM_MSDOS_1
 COND_PLATFORM_MSDOS_0
 COND_PLATFORM_MAC_1
 COND_PLATFORM_MAC_0
-COND_PLATFORM_MACOS_1
 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1
 COND_PLATFORM_MACOSX_1_USE_OPENGL_1
 COND_PLATFORM_MACOSX_1_USE_GUI_1
@@ -816,6 +806,7 @@ COND_PLATFORM_MACOSX_0_USE_SOVERSION_1
 COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1
 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1
 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1
+COND_MONOLITHIC_1_USE_STC_1
 COND_MONOLITHIC_1_SHARED_1
 COND_MONOLITHIC_1_SHARED_0
 COND_MONOLITHIC_1
@@ -862,26 +853,11 @@ COND_DEPS_TRACKING_1
 COND_DEPS_TRACKING_0
 COND_DEBUG_INFO_1
 COND_DEBUG_INFO_0
-COND_DEBUG_FLAG_1
 COND_DEBUG_FLAG_0
-COND_BUILD_release_UNICODE_1
-COND_BUILD_release_UNICODE_0
 COND_BUILD_release_DEBUG_INFO_default
 COND_BUILD_release
-COND_BUILD_debug_UNICODE_1
-COND_BUILD_debug_UNICODE_0
 COND_BUILD_debug_DEBUG_INFO_default
-COND_BUILD_debug_DEBUG_FLAG_default
 COND_BUILD_debug
-COND_BUILD_RELEASE_UNICODE_1
-COND_BUILD_RELEASE_UNICODE_0
-COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT
-COND_BUILD_RELEASE
-COND_BUILD_DEBUG_UNICODE_1
-COND_BUILD_DEBUG_UNICODE_0
-COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT
-COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT
-COND_BUILD_DEBUG
 BK_MAKE_PCH
 ICC_PCH_USE_SWITCH
 ICC_PCH_CREATE_SWITCH
@@ -1129,6 +1105,8 @@ enable_gpe
 with_libpng
 with_libjpeg
 with_libtiff
+with_libjbig
+with_liblzma
 with_libxpm
 with_libiconv
 with_libmspack
@@ -2357,6 +2335,8 @@ Optional Packages:
   --with-libpng           use libpng (PNG image format)
   --with-libjpeg          use libjpeg (JPEG file format)
   --with-libtiff          use libtiff (TIFF file format)
+  --without-libjbig       don't use libjbig in libtiff even if available)
+  --without-liblzma       don't use liblzma in libtiff even if available)
   --with-libxpm           use libxpm (XPM file format)
   --with-libiconv         use libiconv (character conversion)
   --with-libmspack        use libmspack (CHM help files loading)
@@ -4936,6 +4916,94 @@ $as_echo "builtin version" >&6; }
           fi
 
 
+          withstring=without
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$withstring" = xwithout; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${withstring:-with}-libjbig" >&5
+$as_echo_n "checking for --${withstring:-with}-libjbig... " >&6; }
+
+# Check whether --with-libjbig was given.
+if test "${with_libjbig+set}" = set; then :
+  withval=$with_libjbig;
+                        if test "$withval" = yes; then
+                          wx_cv_use_libjbig='wxUSE_LIBJBIG=yes'
+                        else
+                          wx_cv_use_libjbig='wxUSE_LIBJBIG=no'
+                        fi
+
+else
+
+                        wx_cv_use_libjbig='wxUSE_LIBJBIG=${'DEFAULT_wxUSE_LIBJBIG":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_libjbig"
+
+          if test x"$withstring" = xwithout; then
+            if test $wxUSE_LIBJBIG = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_LIBJBIG
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
+
+
+          withstring=without
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$withstring" = xwithout; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${withstring:-with}-liblzma" >&5
+$as_echo_n "checking for --${withstring:-with}-liblzma... " >&6; }
+
+# Check whether --with-liblzma was given.
+if test "${with_liblzma+set}" = set; then :
+  withval=$with_liblzma;
+                        if test "$withval" = yes; then
+                          wx_cv_use_liblzma='wxUSE_LIBLZMA=yes'
+                        else
+                          wx_cv_use_liblzma='wxUSE_LIBLZMA=no'
+                        fi
+
+else
+
+                        wx_cv_use_liblzma='wxUSE_LIBLZMA=${'DEFAULT_wxUSE_LIBLZMA":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_liblzma"
+
+          if test x"$withstring" = xwithout; then
+            if test $wxUSE_LIBLZMA = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_LIBLZMA
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
+
+
           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-libxpm" >&5
 $as_echo_n "checking for --with-libxpm... " >&6; }
 
@@ -22900,6 +22968,97 @@ $as_echo "$as_me: WARNING: system tiff library not found, will use built-in inst
                                                                                     ac_configure_args="$ac_configure_args --disable-jpeg"
         fi
 
+        if test "$wxUSE_LIBLZMA" = "yes"; then
+                                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzma_code in -llzma" >&5
+$as_echo_n "checking for lzma_code in -llzma... " >&6; }
+if ${ac_cv_lib_lzma_lzma_code+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-llzma  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char lzma_code ();
+int
+main ()
+{
+return lzma_code ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_lzma_lzma_code=yes
+else
+  ac_cv_lib_lzma_lzma_code=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lzma_lzma_code" >&5
+$as_echo "$ac_cv_lib_lzma_lzma_code" >&6; }
+if test "x$ac_cv_lib_lzma_lzma_code" = xyes; then :
+  LIBS="$LIBS -llzma"
+fi
+
+        else
+                                    ac_configure_args="$ac_configure_args --disable-lzma"
+        fi
+
+                if test "$wxUSE_LIBJBIG" = "yes"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jbg_dec_init in -ljbig" >&5
+$as_echo_n "checking for jbg_dec_init in -ljbig... " >&6; }
+if ${ac_cv_lib_jbig_jbg_dec_init+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ljbig  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char jbg_dec_init ();
+int
+main ()
+{
+return jbg_dec_init ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_jbig_jbg_dec_init=yes
+else
+  ac_cv_lib_jbig_jbg_dec_init=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jbig_jbg_dec_init" >&5
+$as_echo "$ac_cv_lib_jbig_jbg_dec_init" >&6; }
+if test "x$ac_cv_lib_jbig_jbg_dec_init" = xyes; then :
+  LIBS="$LIBS -ljbig"
+fi
+
+        else
+            ac_configure_args="$ac_configure_args --disable-jbig"
+        fi
+
+
 
 subdirs="$subdirs src/tiff"
 
@@ -23487,12 +23646,14 @@ else
 fi
 
 
-  pkg_config_args=gtk+-3.0
+  pkg_gtk_version=gtk+-3.0
+  pkg_config_args=$pkg_gtk_version
   for module in . $GTK_MODULES
   do
       case "$module" in
          gthread)
-             pkg_config_args="$pkg_config_args gthread-2.0"
+             pkg_gthread_version=gthread-2.0
+             pkg_config_args="$pkg_config_args $pkg_gthread_version"
          ;;
       esac
   done
@@ -23563,8 +23724,7 @@ $as_echo_n "checking for GTK+ - version >= $min_gtk_version... " >&6; }
 	  echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
 	  enable_gtktest=no
     fi
-
-    if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
+    if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_gtk_version ; then
 	  :
     else
 	  no_gtk=yes
@@ -40070,76 +40230,16 @@ EOF
 
 
 
-    COND_BUILD_DEBUG="#"
-    if test "x$BUILD" = "xdebug" ; then
-        COND_BUILD_DEBUG=""
-    fi
-
-    COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT="#"
-    if test "x$BUILD" = "xdebug" -a "x$DEBUG_FLAG" = "xdefault" ; then
-        COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT=""
-    fi
-
-    COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT="#"
-    if test "x$BUILD" = "xdebug" -a "x$DEBUG_INFO" = "xdefault" ; then
-        COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT=""
-    fi
-
-    COND_BUILD_DEBUG_UNICODE_0="#"
-    if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then
-        COND_BUILD_DEBUG_UNICODE_0=""
-    fi
-
-    COND_BUILD_DEBUG_UNICODE_1="#"
-    if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then
-        COND_BUILD_DEBUG_UNICODE_1=""
-    fi
-
-    COND_BUILD_RELEASE="#"
-    if test "x$BUILD" = "xrelease" ; then
-        COND_BUILD_RELEASE=""
-    fi
-
-    COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT="#"
-    if test "x$BUILD" = "xrelease" -a "x$DEBUG_INFO" = "xdefault" ; then
-        COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT=""
-    fi
-
-    COND_BUILD_RELEASE_UNICODE_0="#"
-    if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x0" ; then
-        COND_BUILD_RELEASE_UNICODE_0=""
-    fi
-
-    COND_BUILD_RELEASE_UNICODE_1="#"
-    if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then
-        COND_BUILD_RELEASE_UNICODE_1=""
-    fi
-
     COND_BUILD_debug="#"
     if test "x$BUILD" = "xdebug" ; then
         COND_BUILD_debug=""
     fi
 
-    COND_BUILD_debug_DEBUG_FLAG_default="#"
-    if test "x$BUILD" = "xdebug" -a "x$DEBUG_FLAG" = "xdefault" ; then
-        COND_BUILD_debug_DEBUG_FLAG_default=""
-    fi
-
     COND_BUILD_debug_DEBUG_INFO_default="#"
     if test "x$BUILD" = "xdebug" -a "x$DEBUG_INFO" = "xdefault" ; then
         COND_BUILD_debug_DEBUG_INFO_default=""
     fi
 
-    COND_BUILD_debug_UNICODE_0="#"
-    if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then
-        COND_BUILD_debug_UNICODE_0=""
-    fi
-
-    COND_BUILD_debug_UNICODE_1="#"
-    if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then
-        COND_BUILD_debug_UNICODE_1=""
-    fi
-
     COND_BUILD_release="#"
     if test "x$BUILD" = "xrelease" ; then
         COND_BUILD_release=""
@@ -40150,26 +40250,11 @@ EOF
         COND_BUILD_release_DEBUG_INFO_default=""
     fi
 
-    COND_BUILD_release_UNICODE_0="#"
-    if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x0" ; then
-        COND_BUILD_release_UNICODE_0=""
-    fi
-
-    COND_BUILD_release_UNICODE_1="#"
-    if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then
-        COND_BUILD_release_UNICODE_1=""
-    fi
-
     COND_DEBUG_FLAG_0="#"
     if test "x$DEBUG_FLAG" = "x0" ; then
         COND_DEBUG_FLAG_0=""
     fi
 
-    COND_DEBUG_FLAG_1="#"
-    if test "x$DEBUG_FLAG" = "x1" ; then
-        COND_DEBUG_FLAG_1=""
-    fi
-
     COND_DEBUG_INFO_0="#"
     if test "x$DEBUG_INFO" = "x0" ; then
         COND_DEBUG_INFO_0=""
@@ -40400,6 +40485,11 @@ EOF
         COND_MONOLITHIC_1_SHARED_1=""
     fi
 
+    COND_MONOLITHIC_1_USE_STC_1="#"
+    if test "x$MONOLITHIC" = "x1" -a "x$USE_STC" = "x1" ; then
+        COND_MONOLITHIC_1_USE_STC_1=""
+    fi
+
     COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1="#"
     if test "x$OFFICIAL_BUILD" = "x0" -a "x$PLATFORM_WIN32" = "x1" ; then
         COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1=""
@@ -40500,11 +40590,6 @@ EOF
         COND_PLATFORM_MACOSX_1_USE_SOVERSION_1=""
     fi
 
-    COND_PLATFORM_MACOS_1="#"
-    if test "x$PLATFORM_MACOS" = "x1" ; then
-        COND_PLATFORM_MACOS_1=""
-    fi
-
     COND_PLATFORM_MAC_0="#"
     if test "x$PLATFORM_MAC" = "x0" ; then
         COND_PLATFORM_MAC_0=""
@@ -40950,21 +41035,6 @@ EOF
         COND_USE_GUI_1_WXUNIV_1=""
     fi
 
-    COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="#"
-    if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
-        COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN=""
-    fi
-
-    COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="#"
-    if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
-        COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN=""
-    fi
-
-    COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="#"
-    if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
-        COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
-    fi
-
     COND_USE_GUI_1_wxUSE_LIBJPEG_builtin="#"
     if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
         COND_USE_GUI_1_wxUSE_LIBJPEG_builtin=""
@@ -41075,36 +41145,6 @@ EOF
         COND_WXUNIV_1=""
     fi
 
-    COND_WXUSE_EXPAT_BUILTIN="#"
-    if test "x$wxUSE_EXPAT" = "xbuiltin" ; then
-        COND_WXUSE_EXPAT_BUILTIN=""
-    fi
-
-    COND_WXUSE_LIBJPEG_BUILTIN="#"
-    if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
-        COND_WXUSE_LIBJPEG_BUILTIN=""
-    fi
-
-    COND_WXUSE_LIBPNG_BUILTIN="#"
-    if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
-        COND_WXUSE_LIBPNG_BUILTIN=""
-    fi
-
-    COND_WXUSE_LIBTIFF_BUILTIN="#"
-    if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
-        COND_WXUSE_LIBTIFF_BUILTIN=""
-    fi
-
-    COND_WXUSE_REGEX_BUILTIN="#"
-    if test "x$wxUSE_REGEX" = "xbuiltin" ; then
-        COND_WXUSE_REGEX_BUILTIN=""
-    fi
-
-    COND_WXUSE_ZLIB_BUILTIN="#"
-    if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
-        COND_WXUSE_ZLIB_BUILTIN=""
-    fi
-
     COND_wxUSE_EXPAT_builtin="#"
     if test "x$wxUSE_EXPAT" = "xbuiltin" ; then
         COND_wxUSE_EXPAT_builtin=""