Commit: a0da4bb7d0cb1dcd9c53e836244a68b13a2b5266 - LFScripts (git)

Commit MetaInfo

• Revisión: a0da4bb7d0cb1dcd9c53e836244a68b13a2b5266 (tree)
• Tiempo: 2012-04-01 09:33:56
• Autor: matsuand <matsuand@user...>
• Commiter: matsuand

Log Message

[BLFS] Updated curl.

Cambiar Resumen

• modified: BLFS/curl.sh

Diferencia incremental

--- a/BLFS/curl.sh
+++ b/BLFS/curl.sh
@@ -15,7 +15,7 @@ fi
 
 echo Check Options...
 . ./_checkOptions.sh openssl gnutls openldap heimdal libidn libssh2 \
-	c-ares
+	c-ares cacerts
 
 if [ ${OPTION_libssh2} -eq "1" ]; then
   export WITHSSH2="--with-libssh2 "
@@ -23,6 +23,14 @@ else
   export WITHSSH2=""
 fi
 
+if [ ${OPTION_gnutls} -eq "1" ]; then
+  export WITHGNUTLS="--without-ssl --with-gnutls "
+  export WITHCAPATH=""
+else
+  export WITHGNUTLS=""
+  export WITHCAPATH="--with-ca-path=/etc/ssl/certs "
+fi
+
 cd $SRC
 
 echo $TARGET
@@ -36,8 +44,8 @@ cd $TARGETDIR
 
 echo \ \ Configuring...
 ./configure --prefix=/usr \
-	$WITHSSH2 \
-	--with-ca-path=/etc/ssl/certs \
+	$WITHSSH2 $WITHGNUTLS \
+	$WITHCAPATH \
 	1> $LOG/$TARGET.1_conf.log 2>&1 || exit 1
 
 echo \ \ Making...