X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz-config.in;h=89a2fcbe200def05ed88ac43ab211a4551f9f703;hp=ad78247e630d87ef48fd7dd50591869c1b6621b9;hb=3e6398d15008d68aa36b0b985a18f142fcfa9a8f;hpb=83178ddb2e40a3c9dbde8b7b3e6cf5e8918da990 diff --git a/yaz-config.in b/yaz-config.in index ad78247..89a2fcb 100644 --- a/yaz-config.in +++ b/yaz-config.in @@ -11,13 +11,12 @@ yaz_echo_lalibs=no yaz_echo_comp=no 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@" LIBS="@LIBS@" YAZVERSION=@VERSION@ +VERSION_SHA1=@VERSION_SHA1@ usage() { @@ -30,6 +29,7 @@ Options: [--lalibs] [--cflags] [--comp] + [-V] Libraries: threads icu server EOF @@ -50,6 +50,10 @@ while test $# -gt 0; do echo $yazprefix exit 0 ;; + -V) + echo "$YAZVERSION $VERSION_SHA1" + exit 0 + ;; --version) echo $YAZVERSION exit 0 @@ -133,7 +137,7 @@ else if test "$yazprefix" != "/usr"; then YAZLIB="-L$yazprefix/lib" fi - YAZLIB="$YAZLIB $lyaz $LIBS" + YAZLIB="$YAZLIB $lyaz ${SSL_LIBS} $LIBS" YAZLALIB=$YAZLIB if test "$yazprefix" != "/usr"; then YAZINC="-I$yazprefix/include $YAZINC" @@ -141,9 +145,7 @@ else fi if test "$lib_thread" = "yes"; then - YAZINC="$PTHREAD_CFLAGS $YAZINC" - YAZLIB="$YAZLIB $PTHREAD_LIBS" - YAZLALIB="$YAZLALIB $PTHREAD_LIBS" + : fi if test "$lib_icu" = "yes"; then