Browse code

locate efence/duma using libtool's search path so that it works with /usr/lib64 (bb #1250)

git-svn: trunk@4275

Török Edvin authored on 2008/10/19 20:34:19
Showing 3 changed files
... ...
@@ -1,3 +1,9 @@
1
+Sun Oct 19 14:57:26 EEST 2008 (edwin)
2
+-------------------------------------
3
+ * unit_tests/duma_tests.sh, unit_tests/efence_tests.sh: locate
4
+ efence/duma using libtool's search path so that it works with
5
+ /usr/lib64 (bb #1250)
6
+
1 7
 Thu Oct 16 11:02:38 CEST 2008 (tk)
2 8
 ----------------------------------
3 9
   * freshclam/manager.c: fix compilation error on systems without IPv6 (bb#1237)
... ...
@@ -1,9 +1,10 @@
1 1
 #!/bin/sh
2 2
 # Run under duma
3
+LIBDIRS=`../libtool --config | grep sys_lib_search_path_spec | sed -e 's/.*"\(.*\)"/\1/'`
3 4
 if test -z "$LIBDUMA"; then
4
-	for i in /usr/lib/libduma.so /usr/local/lib/libduma.so; do
5
-		if test -f "$i"; then
6
-			LIBDUMA="$i"
5
+	for i in $LIBIRS; do
6
+		if test -f "$i/libduma.so"; then
7
+			LIBDUMA="$i/libduma.so"
7 8
 			break;
8 9
 		fi
9 10
 	done
... ...
@@ -1,9 +1,10 @@
1 1
 #!/bin/sh
2 2
 # Run under electric-fence
3
+LIBDIRS=`../libtool --config | grep sys_lib_search_path_spec | sed -e 's/.*"\(.*\)"/\1/'`
3 4
 if test -z "$LIBEFENCE"; then
4
-	for i in /usr/lib/libefence.so /usr/local/lib/libefence.so /opt/csw/lib/libefence.so; do
5
-		if test -f "$i"; then
6
-			LIBEFENCE="$i"
5
+	for i in $LIBDIRS; do
6
+		if test -f "$i/libefence.so"; then
7
+			LIBEFENCE="$i/libefence.so"
7 8
 			break;
8 9
 		fi
9 10
 	done