Merge shellback.(none):/home/msvensson/mysql/work/my51-work

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint

extra/yassl/taocrypt/benchmark/Makefile.am

 INCLUDES = -I../include -I../../mySTL
 bin_PROGRAMS       = benchmark
 benchmark_SOURCES  = benchmark.cpp
-benchmark_LDFLAGS  = -L../src
-benchmark_LDADD    = -ltaocrypt
+benchmark_LDADD    = $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la
 benchmark_CXXFLAGS = -DYASSL_PURE_C
-benchmark_DEPENDENCIES = ../src/libtaocrypt.la
 EXTRA_DIST = benchmark.dsp rsa1024.der dh1024.der dsa1024.der make.bat

extra/yassl/taocrypt/test/Makefile.am

 INCLUDES = -I../include -I../../mySTL
 bin_PROGRAMS = test
 test_SOURCES = test.cpp
-test_LDFLAGS  = -L../src
-test_LDADD    = -ltaocrypt
-test_DEPENDENCIES = ../src/libtaocrypt.la
+test_LDADD    = $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la
 test_CXXFLAGS = -DYASSL_PURE_C
 EXTRA_DIST = make.bat

extra/yassl/testsuite/Makefile.am

@@ -4,10 +4,9 @@ testsuite_SOURCES  = testsuite.cpp ../taocrypt/test/test.cpp \
 	../examples/client/client.cpp ../examples/server/server.cpp \
 	../examples/echoclient/echoclient.cpp \
 	../examples/echoserver/echoserver.cpp
-testsuite_LDFLAGS  = -L../src/ -L../taocrypt/src
 testsuite_CXXFLAGS = -DYASSL_PURE_C -DYASSL_PREFIX -DNO_MAIN_DRIVER
-testsuite_LDADD    = -lyassl -ltaocrypt
-testsuite_DEPENDENCIES = ../src/libyassl.la ../taocrypt/src/libtaocrypt.la
+testsuite_LDADD    = $(top_builddir)/extra/yassl/src/libyassl.la \
+                     $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la
 EXTRA_DIST = testsuite.dsp test.hpp input quit make.bat
 
 # Don't update the files from bitkeeper