X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=yaz-config.in;h=4c0353accafd83190452e38ad68862fe9bc9d505;hb=29ae3278722e4a61905cc5d330fc2d286d2e7016;hp=5cbc6bc1204305f619b73c1e98f9735a9043b610;hpb=b80c29e05c84270159284f5b1297e38175cd63e0;p=yaz-moved-to-github.git diff --git a/yaz-config.in b/yaz-config.in index 5cbc6bc..4c0353a 100644 --- a/yaz-config.in +++ b/yaz-config.in @@ -1,5 +1,7 @@ #!/bin/sh -# $Id: yaz-config.in,v 1.32 2007-10-22 12:50:52 adam Exp $ +# This file is part of the YAZ toolkit. +# Copyright (C) 1995-2008 Index Data + yazprefix=@prefix@ yaz_echo_cflags=no yaz_echo_libs=no @@ -13,7 +15,7 @@ PTHREAD_LIBS="@PTHREAD_LIBS@" PTHREAD_CFLAGS="@PTHREAD_CFLAGS@" ICU_LIBS="@ICU_LIBS@" ICU_CPPFLAGS="@ICU_CPPFLAGS@" - +SSL_LIBS="@SSL_LIBS@" yazextralibs="@LIBS@" YAZVERSION=@VERSION@ @@ -29,7 +31,7 @@ Options: [--cflags] [--comp] Libraries: - threads + threads icu server EOF exit $1 } @@ -68,7 +70,9 @@ while test $# -gt 0; do lib_thread=yes ;; icu) - lib_icu=yes + if test "$ICU_CPPFLAGS"; then + lib_icu=yes + fi ;; server) lib_thread=yes @@ -106,7 +110,7 @@ if test "$yaz_echo_source" = "yes"; then else YAZLIB="-L${yaz_build_root}/src/.libs $lyaz" fi - YAZLIB="$YAZLIB $yazextralibs" + YAZLIB="$YAZLIB ${SSL_LIBS} $yazextralibs" YAZLALIB="${yaz_build_root}/src/libyaz.la" if test "$lib_server" = "yes"; then