Check-in [b968cf8855]
Overview
Comment:Updated TLS build to allow the user to specify their own SSLDIR environment variable
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:b968cf885596eb54bbf74df4ffee144c121fbe64
User & Date: rkeene on 2010-10-09 11:34:04
Other Links: manifest | tags
Context
2010-10-09
15:32
Updated to not emit duplicate requirements check-in: 256ae2708d user: rkeene tags: trunk
11:34
Updated TLS build to allow the user to specify their own SSLDIR environment variable check-in: b968cf8855 user: rkeene tags: trunk
10:43
Updated to support using a patch command specified in the PATCH environment variable check-in: 2307c8734f user: rkeene tags: trunk
Changes

Modified server/buildpkgs/tls/build.sh from [c5be0601cf] to [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  +	if [ -z "${SSLDIR}" ]; then
    48     49   	for chkssldir in $(pkg-config openssl --cflags | sed 's@ *-I *@|@g' | tr '|' "\n" | grep '^/'); do
    49     50   		if [ -f "${chkssldir}/openssl/opensslv.h" -o -f "${chkssldir}/opensslv.h" ]; then
    50     51   			SSLDIR=$(echo "${chkssldir}" | sed 's@/[^/]*/*$@@')
    51     52   		fi
    52     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