[lmi-commits] [lmi] master 2539270 2/5: No longer restrict libjpeg-turbo or libtiff

[Greg Chicares]

branch: master
commit 2539270a8998575a023014d27f34825f4301c00a
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    No longer restrict libjpeg-turbo or libtiff
    
    Any patents that applied in the past have expired. See:
      https://lists.nongnu.org/archive/html/lmi/2018-04/msg00050.html
---
 README.auto     | 2 --
 install_wx.make | 2 --
 install_wx.sh   | 8 --------
 3 files changed, 12 deletions(-)

diff --git a/README.auto b/README.auto
index f979ab8..7b14acb 100644
--- a/README.auto
+++ b/README.auto
@@ -51,8 +51,6 @@ a) wxWidgets: create any directory (it will be called 
wx-build below),
                 --enable-std_string \
                 --disable-threads \
                 --disable-apple_ieee \
-                --without-libjpeg \
-                --without-libtiff \
                 --disable-gif
 
         You may add "--prefix=" option if you are building shared libraries
diff --git a/install_wx.make b/install_wx.make
index b8c4edb..072bed2 100644
--- a/install_wx.make
+++ b/install_wx.make
@@ -117,8 +117,6 @@ config_options = \
   --enable-stl \
   --enable-vendor='$(vendor)' \
   --with-cxx=11 \
-  --without-libjpeg \
-  --without-libtiff \
   --without-opengl \
   --without-subdirs \
   CFLAGS='$(wx_cc_flags)' \
diff --git a/install_wx.sh b/install_wx.sh
index 90f42da..13c75a5 100755
--- a/install_wx.sh
+++ b/install_wx.sh
@@ -66,12 +66,6 @@ git checkout "$wx_commit_sha"
 # updating an existing working tree if a new submodule is added upstream.
 git submodule status | grep '^-' | cut -d' ' -f2 | while read -r subpath
 do
-    case $subpath in
-        src/jpeg | src/tiff)
-            continue
-            ;;
-    esac
-
     suburl=$(git config --file .gitmodules --get submodule.${subpath}.url)
 
     # Configure the submodule to use URL relative to the one used for the
@@ -149,8 +143,6 @@ config_options="
   --with-expat=builtin
   --with-libpng=builtin
   --with-zlib=builtin
-  --without-libjpeg
-  --without-libtiff
   --without-opengl
   --without-subdirs
   CPPFLAGS=-I$prefix/include