Fixed typo

[yaz-moved-to-github.git] / yaz-config.in

diff --git a/yaz-config.in b/yaz-config.in
index 9cd2b87..3420e35 100644 (file)
--- 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,8 +29,9 @@ Options:
        [--lalibs]
        [--cflags]
        [--comp]
+        [-V]
 Libraries:
-       threads icu server
+       threads icu server static
 EOF
        exit $1
 }
@@ -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
@@ -74,6 +78,9 @@ while test $# -gt 0; do
                lib_icu=yes
            fi
            ;;
+       ssl)
+           lib_ssl=yes
+           ;;
        server)
            lib_thread=yes
            lib_server=yes
@@ -88,13 +95,17 @@ while test $# -gt 0; do
     shift
 done
 
-lyaz="-lyaz"
+YAZLIB="-lyaz"
 if test "$lib_server" = "yes"; then
-    lyaz="-lyaz_server $lyaz"
+    YAZLIB="-lyaz_server $YAZLIB"
 fi
 
 if test "$lib_icu" = "yes"; then
-    lyaz="-lyaz_icu $lyaz"
+    YAZLIB="-lyaz_icu $YAZLIB"
+fi
+
+if test "$lib_ssl" = "yes"; then
+    LIBS="${SSL_LIBS} $LIBS"
 fi
 
 YAZINC="@YAZ_CONFIG_CFLAGS@"
@@ -103,14 +114,20 @@ if test "$yaz_echo_source" = "yes"; then
     YAZBIN=${yaz_build_root}/bin
 
     if test "$lib_static" = "yes"; then
+        if test "$lib_ssl" != "yes"; then
+            LIBS="${SSL_LIBS} $LIBS"
+        fi
         YAZLIB="${yaz_build_root}/src/.libs/libyaz.a"
         if test "$lib_server" = "yes"; then
            YAZLIB="${yaz_build_root}/src/.libs/libyaz_server.a $YAZLIB"
         fi
+        if test "$lib_icu" = "yes"; then
+           YAZLIB="${yaz_build_root}/src/.libs/libyaz_icu.a $YAZLIB"
+        fi
     else
-        YAZLIB="-L${yaz_build_root}/src/.libs $lyaz"
+        YAZLIB="-L${yaz_build_root}/src/.libs $YAZLIB"
     fi
-    YAZLIB="$YAZLIB ${SSL_LIBS} $LIBS"
+    YAZLIB="$YAZLIB $LIBS"
 
     YAZLALIB="${yaz_build_root}/src/libyaz.la"
     if test "$lib_server" = "yes"; then
@@ -128,9 +145,9 @@ else
     YAZCOMP=${yazprefix}/bin/yaz-asncomp
 
     if test "$yazprefix" != "/usr"; then
-       YAZLIB="-L$yazprefix/lib"
+       YAZLIB="-L$yazprefix/lib $YAZLIB"
     fi
-    YAZLIB="$YAZLIB $lyaz $LIBS"
+    YAZLIB="$YAZLIB $LIBS"
     YAZLALIB=$YAZLIB
     if test "$yazprefix" != "/usr"; then
        YAZINC="-I$yazprefix/include $YAZINC"
@@ -138,9 +155,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