r3621 - jhalfs/branches/ablfs/common/libs

pierre at linuxfromscratch.org pierre at linuxfromscratch.org
Thu Apr 5 12:55:24 PDT 2012


Author: pierre
Date: 2012-04-05 13:55:14 -0600 (Thu, 05 Apr 2012)
New Revision: 3621

Modified:
   jhalfs/branches/ablfs/common/libs/func_install_blfs
Log:
Change order in func_install_blfs so that wget is installed
with openssl support if selected

Modified: jhalfs/branches/ablfs/common/libs/func_install_blfs
===================================================================
--- jhalfs/branches/ablfs/common/libs/func_install_blfs	2012-03-29 08:24:02 UTC (rev 3620)
+++ jhalfs/branches/ablfs/common/libs/func_install_blfs	2012-04-05 19:55:14 UTC (rev 3621)
@@ -94,10 +94,10 @@
 $LINE_PYTHON
 $LINE_LIBXML
 $LINE_LIBXSLT
-$LINE_WGET
 $LINE_TIDY
 $LINE_DBXML
 $LINE_OPENSSL
+$LINE_WGET
 $LINE_SVN
 $LINE_GPM
 $LINE_LYNX
@@ -133,7 +133,7 @@
 rm -v $BUILDDIR$BLFS_ROOT/download_script
 
 # Suppresses unneeded parts of the scriptlets
-if [ "$DEP_WGET" = y ]; then
+if [ "$DEP_WGET" = y ] && ! [ "$DEP_OPENSSL" = y ]; then
   sed -i s'/-ssl=.*/out-ssl/' $BUILDDIR$BLFS_ROOT/scripts/*wget
 fi
 if [ "$DEP_SUDO" = y ]; then




More information about the alfs-log mailing list