Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz

diff --combined configure.ac
index c3f0e5b,c25249f..5bf8c8e
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1,7 -1,7 +1,7 @@@
  dnl This file is part of the YAZ toolkit.
  dnl Copyright (C) 1995-2010 Index Data
  AC_PREREQ([2.60])
 -AC_INIT([yaz],[4.0.3],[yaz-help@indexdata.dk])
 +AC_INIT([yaz],[4.0.4],[yaz-help@indexdata.dk])
  AC_CONFIG_SRCDIR([configure.ac])
  AC_CONFIG_AUX_DIR([config])
  AM_INIT_AUTOMAKE([1.9])
@@@ -333,7 -333,7 +333,7 @@@ if test "$enable_threads" = "yes" -a "$
                done
                LIBS=$OLIBS
            fi
-           LIBS=$PTHREAD_LIBS
+           LIBS="$LIBS $PTHREAD_LIBS"
            CFLAGS="$CFLAGS -DYAZ_POSIX_THREADS=1"
            YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_POSIX_THREADS=1"
            ])