X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=yaz-config.in;h=4c0353accafd83190452e38ad68862fe9bc9d505;hb=bb0028c3ec66f017999b3f49daeb2b537e5e78b1;hp=a1be1333bea42cdfa0a85b0f4f6597e2dfab047c;hpb=965d5409daba88b43bbffb5bed90b58383c0cc3f;p=yaz-moved-to-github.git diff --git a/yaz-config.in b/yaz-config.in index a1be133..4c0353a 100644 --- a/yaz-config.in +++ b/yaz-config.in @@ -1,5 +1,7 @@ #!/bin/sh -# $Id: yaz-config.in,v 1.29 2007-04-18 13:40:19 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 @@ -11,7 +13,9 @@ yaz_src_root=@YAZ_SRC_ROOT@ yaz_build_root=@YAZ_BUILD_ROOT@ PTHREAD_LIBS="@PTHREAD_LIBS@" PTHREAD_CFLAGS="@PTHREAD_CFLAGS@" - +ICU_LIBS="@ICU_LIBS@" +ICU_CPPFLAGS="@ICU_CPPFLAGS@" +SSL_LIBS="@SSL_LIBS@" yazextralibs="@LIBS@" YAZVERSION=@VERSION@ @@ -27,7 +31,7 @@ Options: [--cflags] [--comp] Libraries: - threads + threads icu server EOF exit $1 } @@ -65,6 +69,11 @@ while test $# -gt 0; do threads) lib_thread=yes ;; + icu) + if test "$ICU_CPPFLAGS"; then + lib_icu=yes + fi + ;; server) lib_thread=yes lib_server=yes @@ -84,6 +93,10 @@ if test "$lib_server" = "yes"; then lyaz="-lyaz_server $lyaz" fi +if test "$lib_icu" = "yes"; then + lyaz="-lyaz_icu $lyaz" +fi + YAZINC="@YAZ_CONFIG_CFLAGS@" if test "$yaz_echo_source" = "yes"; then @@ -97,12 +110,15 @@ 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 YAZLALIB="${yaz_build_root}/src/libyaz_server.la $YAZLALIB" fi + if test "$lib_icu" = "yes"; then + YAZLALIB="${yaz_build_root}/src/libyaz_icu.la $YAZLALIB" + fi YAZLALIB="$YAZLALIB $yazextralibs" YAZINC="-I${yaz_src_root}/include $YAZINC" @@ -123,10 +139,14 @@ fi if test "$lib_thread" = "yes"; then YAZINC="$PTHREAD_CFLAGS $YAZINC" + YAZLIB="$YAZLIB $PTHREAD_LIBS" + YAZLALIB="$YAZLALIB $PTHREAD_LIBS" fi -if test "$lib_thread" = "yes"; then - YAZLIB="$YAZLIB $PTHREAD_LIBS" +if test "$lib_icu" = "yes"; then + YAZINC="$YAZINC $ICU_CPPFLAGS" + YAZLIB="$YAZLIB $ICU_LIBS" + YAZLALIB="$YAZLALIB $ICU_LIBS" fi if test "$yaz_echo_help" = "yes"; then