Implemented CORE-6366: Check presence of tomcrypt & curses libraries …

…before installing firebird

builds/install/arch-specific/linux/linuxLibrary.sh.in

@@ -509,10 +509,9 @@ CorrectLibDir() {
 # Validate library name
 
 checkLibName() {
-	libName=${1}
 	grepFlag=-v
 	[ "@CPU_TYPE@" = "amd64" ] && grepFlag=
-	ldconfig -p | grep -w "$libName" | grep $grepFlag 'x86-64'
+	ldconfig -p | grep -w "${1}" | grep $grepFlag 'x86-64'
 }
 
 
@@ -527,8 +526,7 @@ haveLibrary() {
 
 	checkLibName "$libName" >/dev/null 2>/dev/null && return 0
 
-	libName="lib${libName}"
-	checkLibName "$libName" >/dev/null 2>/dev/null
+	checkLibName "lib$libName" >/dev/null 2>/dev/null
 
 	return $?
 }

builds/install/arch-specific/linux/makeInstallImage.sh.in

@@ -54,6 +54,13 @@ addLibs() {
 	touch $libTarget
 	echo "#!/bin/sh" >>$libTarget
 	echo >>$libTarget
+
+	LIB=`objdump -p $libSdir/firebird|grep NEEDED|grep tomcrypt|awk '{print $2;}'`
+	[ "$LIB" ] && echo "export LIBTOMCRYPT=$LIB" >>$libTarget
+	LIB=`objdump -p $libSdir/isql|grep NEEDED|egrep "(curses|termcap|tinfo)"|awk '{print $2;}'`
+	[ "$LIB" ] && echo "export LIBCURSES=$LIB" >>$libTarget
+	echo >>$libTarget
+
 	for i in posixLibrary.sh linuxLibrary.sh
 	do
 		echo "# $i" >>$libTarget

builds/install/posix-common/posixLibrary.sh.in

@@ -219,19 +219,22 @@ checkLibrary() {
 #------------------------------------------------------------------------
 # Make sure we have required libraries installed
 checkLibraries() {
-	if [ "@TOMMATH_BUILD@" != "Y" ]
+	if [ "@TOMMATH_BUILD@" != "Y" -o "${fb_install_prefix}" != "${default_prefix}" ]
 	then
 		fixTommath=
 		checkLibrary tommath
 		haveLibrary libtommath.so.0 || [ "$fixTommath" ] && $fixTommath
 	fi
 
-	if [ "@TOMCRYPT_BUILD@" != "Y" ]
+	if [ "@TOMCRYPT_BUILD@" != "Y" -o "${fb_install_prefix}" != "${default_prefix}" ]
 	then
-		checkLibrary tomcrypt
+		[ -z "$LIBTOMCRYPT" ] && LIBTOMCRYPT=tomcrypt
+		checkLibrary $LIBTOMCRYPT
 	fi
 
 	checkLibrary icudata
+
+	[ "$LIBCURSES" ] && checkLibrary $LIBCURSES
 }