Fix dynamic linkage to the required library
This patch is Debian specific because it hardcodes the linked library
(ie it does not use configure results)
--- a/configure.ac
+++ b/configure.ac
@@ -14,8 +14,13 @@
 main_zebralib=index/libidzebra${PACKAGE_SUFFIX}.la
 AC_SUBST(main_zebralib)
 dnl ------ Substitutions
+AC_SUBST(CRYPT_LIBS)
+AC_SUBST(DL_LIBS)
+AC_SUBST(BZIP2_LIBS)
+AC_SUBST(ZLIB_LIBS)
 AC_SUBST(TCL_INCLUDE)
 AC_SUBST(TCL_LIB)
+AC_SUBST(TCL_LIB_SPEC)
 AC_SUBST(READLINE_LIBS)
 AC_SUBST(ZEBRA_CFLAGS)
 dnl
@@ -28,16 +33,20 @@
 dnl ------ headers
 AC_CHECK_HEADERS([sys/resource.h sys/time.h sys/wait.h sys/utsname.h unistd.h])
 dnl ------ crypt
+old_LIBS="$LIBS"
 AC_CHECK_LIB([crypt],[crypt])
 if test "$ac_cv_lib_crypt_crypt" = "yes"; then
     AC_CHECK_HEADERS(crypt.h)
 fi
+CRYPT_LIBS="$LIBS"
+LIBS="$old_LIBS"
 dnl
 dnl ------ YAZ
 YAZ_INIT([server icu],[3.0.17])
 if test "$YAZVERSION" = "NONE"; then
     AC_MSG_ERROR([YAZ development libraries required])
 fi
+YAZLALIB=/usr/lib/libyaz.la
 YAZ_DOC
 dnl ------ Look for Tcl
 dnl See if user has specified location of tclConfig.sh; otherwise
@@ -164,6 +173,7 @@
 fi
 dnl
 dnl ------- BZIP2
+old_LIBS="$LIBS"
 AC_CHECK_LIB(bz2,bzCompressInit)
 if test "$ac_cv_lib_bz2_bzCompressInit" = "yes"; then
     AC_CHECK_HEADERS(bzlib.h)
@@ -173,16 +183,22 @@
 	AC_CHECK_HEADERS(bzlib.h)
     fi
 fi
+BZIP2_LIBS="$LIBS"
+LIBS="$old_LIBS"
 dnl
 dnl ------- zlib
+old_LIBS="$LIBS"
 AC_CHECK_LIB([z],[compress2])
 if test "$ac_cv_lib_z_compress2" = "yes"; then
     AC_CHECK_HEADERS([zlib.h])
 fi
-dnl ------ -lm
-AC_CHECK_LIB(m,sqrt)
+ZLIB_LIBS="$LIBS"
+LIBS="$old_LIBS"
 dnl ------ -ldl
+old_LIBS="$LIBS"
 AC_CHECK_LIB(dl,dlopen)
+DL_LIBS="$LIBS"
+LIBS="$old_LIBS"
 dnl
 dnl ------ EXPAT
 expat=yes
--- a/index/Makefile.am
+++ b/index/Makefile.am
@@ -22,18 +22,18 @@
 # The shared modules 
 mod_grs_regx_la_SOURCES = mod_grs_regx.c
 mod_grs_regx_la_LDFLAGS = -rpath $(modlibdir) -module -avoid-version
-mod_grs_regx_la_LADD = $(TCL_LIB)
-mod_grs_regx_la_LIBADD = $(zebralib) $(mod_grs_regx_la_LADD)
+mod_grs_regx_la_LADD = $(TCL_LIB_SPEC)
+mod_grs_regx_la_LIBADD = $(zebralib) $(mod_grs_regx_la_LADD) -lyaz
 
 mod_grs_xml_la_SOURCES = mod_grs_xml.c
 mod_grs_xml_la_LDFLAGS = -rpath $(modlibdir) -module -avoid-version
 mod_grs_xml_la_LADD = $(EXPAT_LIBS)
-mod_grs_xml_la_LIBADD = $(zebralib) $(mod_grs_xml_la_LADD)
+mod_grs_xml_la_LIBADD = $(zebralib) $(mod_grs_xml_la_LADD) -lyaz
 
 mod_grs_marc_la_SOURCES = mod_grs_marc.c marcomp.c marcomp.h inline.c inline.h
 mod_grs_marc_la_LDFLAGS = -rpath $(modlibdir) -module -avoid-version
 mod_grs_marc_la_LADD =
-mod_grs_marc_la_LIBADD = $(zebralib) $(mod_grs_marc_la_LADD)
+mod_grs_marc_la_LIBADD = $(zebralib) $(mod_grs_marc_la_LADD) -lyaz
 
 mod_safari_la_SOURCES = mod_safari.c
 mod_safari_la_LDFLAGS = -rpath $(modlibdir) -module -avoid-version
@@ -43,17 +43,17 @@
 mod_alvis_la_SOURCES = mod_alvis.c
 mod_alvis_la_LDFLAGS = -rpath $(modlibdir) -module -avoid-version
 mod_alvis_la_LADD =
-mod_alvis_la_LIBADD = $(zebralib) $(mod_alvis_la_LADD)
+mod_alvis_la_LIBADD = $(zebralib) $(mod_alvis_la_LADD) -lyaz -lexslt -lxslt -lxml2
 
 mod_dom_la_SOURCES = mod_dom.c
 mod_dom_la_LDFLAGS = -rpath $(modlibdir) -module -avoid-version
 mod_dom_la_LADD =
-mod_dom_la_LIBADD = $(zebralib) $(mod_dom_la_LADD)
+mod_dom_la_LIBADD = $(zebralib) $(mod_dom_la_LADD) -lyaz -lexslt -lxslt -lxml2
 
 mod_text_la_SOURCES = mod_text.c
 mod_text_la_LDFLAGS = -rpath $(modlibdir) -module -avoid-version
 mod_text_la_LADD =
-mod_text_la_LIBADD = $(zebralib) $(mod_text_la_LADD)
+mod_text_la_LIBADD = $(zebralib) $(mod_text_la_LADD) -lyaz
 
 modlib_LTLIBRARIES = $(SHARED_MODULE_LA) 
 EXTRA_LTLIBRARIES = \
@@ -77,7 +77,7 @@
 lib_LTLIBRARIES = $(zebralib)
 
 libidzebra_2_0_la_DEPENDENCIES = $(STATIC_MODULE_OBJ) $(aux_libs)
-libidzebra_2_0_la_LIBADD = $(STATIC_MODULE_OBJ)  $(aux_libs) $(STATIC_MODULE_LADD)
+libidzebra_2_0_la_LIBADD = $(STATIC_MODULE_OBJ)  $(aux_libs) $(STATIC_MODULE_LADD) $(DL_LIBS) $(CRYPT_LIBS) $(BZIP2_LIBS) $(ZLIB_LIBS) -lyaz -lyaz_icu -lpthread -lxml2
 libidzebra_2_0_la_LDFLAGS=-export-dynamic -version-info $(ZEBRALIBS_VERSION_INFO)
 libidzebra_2_0_la_SOURCES = \
   recctrl.c \
@@ -111,8 +111,10 @@
   -DDEFAULT_MODULE_PATH=\"$(modlibdir)\" \
   $(TCL_INCLUDE)
 
-LDADD = $(zebralib) $(YAZLALIB) 
+LDADD = $(zebralib)
+AM_LDFLAGS = -Wl,--as-needed
 
+zebrasrv_LDADD = $(LDADD) -lyaz_server
 zebrash_LDADD= $(LDADD) $(READLINE_LIBS)
 
 install-exec-hook:
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -19,12 +19,15 @@
  attrfind.c exit.c it_key.c su_codec.c strmap.c
 
 tstpass_SOURCES = tstpass.c
+tstpass_LDADD = $(LDADD) -lcrypt
 
 tstcharmap_SOURCES = tstcharmap.c
 
 tstflock_SOURCES = tstflock.c
+tstflock_LDADD = $(LDADD) -lpthread
 
 tstlockscope_SOURCES = tstlockscope.c
+tstlockscope_LDADD = $(LDADD) -lpthread
 
 tstres_SOURCES = tstres.c