-if test "$lib_thread" = "yes"; then
- yazextralibs="@LIBTHREAD@ $yazextralibs"
- lyaz="-lyazthread -lyaz"
-else
- lyaz="-lyaz"
-fi
+YAZLIB="-lyaz"
+if test "$lib_server" = "yes"; then
+ YAZLIB="-lyaz_server $YAZLIB"
+fi
+
+if test "$lib_icu" = "yes"; then
+ YAZLIB="-lyaz_icu $YAZLIB"
+fi
+
+if test "$lib_ssl" = "yes" -o "$lib_static" = "yes"; then
+ LIBS="${SSL_LIBS} $LIBS"
+fi
+
+YAZINC="@YAZ_CONFIG_CFLAGS@"
+