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
42
43
44
45
46
47

48
49
50
51
52

53
54
55
56
57
58
59
		if [ ! -f "${patchfile}" ]; then
			continue
		fi

		"${PATCH:-patch}" -p1 < "${patchfile}"
	done


	for chkssldir in $(pkg-config openssl --cflags | sed 's@ *-I *@|@g' | tr '|' "\n" | grep '^/'); do
		if [ -f "${chkssldir}/openssl/opensslv.h" -o -f "${chkssldir}/opensslv.h" ]; then
			SSLDIR=$(echo "${chkssldir}" | sed 's@/[^/]*/*$@@')
		fi
	done

	if [ -z "${SSLDIR}" ]; then
		SSLDIR="/usr"
	fi

	bash ./configure --enable-shared --with-tcl="${TCLCONFIGDIR}" --with-ssl-dir="${SSLDIR}" ${CONFIGUREEXTRA}
	${MAKE:-make} || exit 1
) || exit 1







>





>







41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
		if [ ! -f "${patchfile}" ]; then
			continue
		fi

		"${PATCH:-patch}" -p1 < "${patchfile}"
	done

	if [ -z "${SSLDIR}" ]; then
		for chkssldir in $(pkg-config openssl --cflags | sed 's@ *-I *@|@g' | tr '|' "\n" | grep '^/'); do
			if [ -f "${chkssldir}/openssl/opensslv.h" -o -f "${chkssldir}/opensslv.h" ]; then
				SSLDIR=$(echo "${chkssldir}" | sed 's@/[^/]*/*$@@')
			fi
		done
	fi
	if [ -z "${SSLDIR}" ]; then
		SSLDIR="/usr"
	fi

	bash ./configure --enable-shared --with-tcl="${TCLCONFIGDIR}" --with-ssl-dir="${SSLDIR}" ${CONFIGUREEXTRA}
	${MAKE:-make} || exit 1
) || exit 1