Diff

Differences From Artifact [c5be0601cf]:

To Artifact [ce188ee01b]:


    41     41   		if [ ! -f "${patchfile}" ]; then
    42     42   			continue
    43     43   		fi
    44     44   
    45     45   		"${PATCH:-patch}" -p1 < "${patchfile}"
    46     46   	done
    47     47   
    48         -	for chkssldir in $(pkg-config openssl --cflags | sed 's@ *-I *@|@g' | tr '|' "\n" | grep '^/'); do
    49         -		if [ -f "${chkssldir}/openssl/opensslv.h" -o -f "${chkssldir}/opensslv.h" ]; then
    50         -			SSLDIR=$(echo "${chkssldir}" | sed 's@/[^/]*/*$@@')
    51         -		fi
    52         -	done
           48  +	if [ -z "${SSLDIR}" ]; then
           49  +		for chkssldir in $(pkg-config openssl --cflags | sed 's@ *-I *@|@g' | tr '|' "\n" | grep '^/'); do
           50  +			if [ -f "${chkssldir}/openssl/opensslv.h" -o -f "${chkssldir}/opensslv.h" ]; then
           51  +				SSLDIR=$(echo "${chkssldir}" | sed 's@/[^/]*/*$@@')
           52  +			fi
           53  +		done
           54  +	fi
    53     55   	if [ -z "${SSLDIR}" ]; then
    54     56   		SSLDIR="/usr"
    55     57   	fi
    56     58   
    57     59   	bash ./configure --enable-shared --with-tcl="${TCLCONFIGDIR}" --with-ssl-dir="${SSLDIR}" ${CONFIGUREEXTRA}
    58     60   	${MAKE:-make} || exit 1
    59     61   ) || exit 1