[sword-svn] r3470 - trunk

[scribe at crosswire.org]

Author: scribe
Date: 2017-05-21 21:15:40 -0700 (Sun, 21 May 2017)
New Revision: 3470

Modified:
   trunk/configure.ac
   trunk/usrinst.sh
Log:
Turned experimental compression drivers off by default
Added explanation to usrinst.sh

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2017-05-22 03:28:49 UTC (rev 3469)
+++ trunk/configure.ac	2017-05-22 04:15:40 UTC (rev 3470)
@@ -53,9 +53,9 @@
 AC_ARG_WITH(zlib,
 	AC_HELP_STRING([--with-zlib],[allow zlib compressed modules (default=yes)]),,with_zlib=yes)
 AC_ARG_WITH(bzip2,
-	AC_HELP_STRING([--with-bzip2],[allow bzip2 compressed modules (default=yes)]),,with_bzip2=yes)
+	AC_HELP_STRING([--with-bzip2],[allow bzip2 compressed modules (default=no)]),,with_bzip2=no)
 AC_ARG_WITH(xz,
-	AC_HELP_STRING([--with-xz],[allow xz compressed modules (default=yes)]),,with_xz=yes)
+	AC_HELP_STRING([--with-xz],[allow xz compressed modules (default=no)]),,with_xz=no)
 AC_ARG_WITH(icu,
 	AC_HELP_STRING([--with-icu],[use ICU for unicode (default=yes)]),,with_icu=yes)
 AC_ARG_WITH(icusword,

Modified: trunk/usrinst.sh
===================================================================
--- trunk/usrinst.sh	2017-05-22 03:28:49 UTC (rev 3469)
+++ trunk/usrinst.sh	2017-05-22 04:15:40 UTC (rev 3470)
@@ -49,6 +49,25 @@
 #LIBS="-no-undefined"
 #OPTIONS="lt_cv_deplibs_check_method=pass_all $OPTIONS"
 
+# These are for experimental purposes, review,
+# may not be available on all platforms, are unsupported,
+# and no modules should be released which depend on them. 
+# If significant gains in size and speed are achieved,
+# we should discuss the portability of these libraries
+# and decide if we should make the switch to prefer one
+# of these compression systems over zlib.
+# That's not to say that support for these is not appreciated
+# (chrislit)-- on the contrary, this is the R in R&D, we just
+# need to consider portability: ios, android-ndk, and
+# windows support, before implying modules can be made with them.
+# I am all for switching to one, by policy, if we observe appreciable
+# gains and confirm portability.  I only see support disadvantages to
+# expanding compression options, otherwise.
+
+#OPTIONS="--with-bzip2 $OPTIONS"
+#OPTIONS="--with-xz $OPTIONS"
+
+
 LIBS="$LIBS" ./configure $OPTIONS $*