ZOOM now allows inspection of X509 peer certificate for verification.

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

diff --git a/yaz-config.in b/yaz-config.in
index ee94710..e8fb979 100644 (file)
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -1,5 +1,5 @@
 #!/bin/sh
 #!/bin/sh

-# $Id: yaz-config.in,v 1.19 2004-01-05 09:45:49 adam Exp $
+# $Id: yaz-config.in,v 1.20 2004-04-28 22:44:58 adam Exp $

 yazprefix=@prefix@
 yaz_echo_cflags=no
 yaz_echo_libs=no
 yazprefix=@prefix@
 yaz_echo_cflags=no
 yaz_echo_libs=no

@@ -10,7 +10,7 @@ yaz_echo_comp=no
 yaz_src_root=@YAZ_SRC_ROOT@
 yaz_build_root=@YAZ_BUILD_ROOT@
 
 yaz_src_root=@YAZ_SRC_ROOT@
 yaz_build_root=@YAZ_BUILD_ROOT@
 

-yazextralibs="@LIBS@"
+yazextralibs="@SSL_LIBS@ @LIBS@"

 YAZVERSION=@VERSION@
 
 usage()
 YAZVERSION=@VERSION@
 
 usage()

@@ -26,8 +26,6 @@ Options:
        [--comp]
 Libraries:
        threads
        [--comp]
 Libraries:
        threads

-        malloc
-        ssl

 EOF
        exit $1
 }
 EOF
        exit $1
 }

@@ -72,9 +70,6 @@ while test $# -gt 0; do
     malloc)
       lib_malloc=yes
       ;;
     malloc)
       lib_malloc=yes
       ;;

-    ssl)
-      lib_ssl=yes
-      ;;

     -*)
       yaz_echo_help=yes
       ;;
     -*)
       yaz_echo_help=yes
       ;;

@@ -89,18 +84,10 @@ if test "$lib_thread" = "yes" -a -n "@CFLAGSTHREADS@"; then
     lyaz="-lyazthread $lyaz"
 fi 
 
     lyaz="-lyazthread $lyaz"
 fi 
 

-if test "$lib_ssl" = "yes" -a -n "@SSL_LIBS@"; then
-    yazextralibs="@SSL_LIBS@ $yazextralibs"
-    lyaz="-lyazssl $lyaz"
-fi
-

 if test "$yaz_echo_source" = "yes"; then
     YAZBIN=${yaz_build_root}/bin
     YAZLIB="-L${yaz_build_root}/src/.libs $lyaz $yazextralibs"
     YAZLALIB="${yaz_build_root}/src/libyaz.la $yazextralibs"
 if test "$yaz_echo_source" = "yes"; then
     YAZBIN=${yaz_build_root}/bin
     YAZLIB="-L${yaz_build_root}/src/.libs $lyaz $yazextralibs"
     YAZLALIB="${yaz_build_root}/src/libyaz.la $yazextralibs"

-    if test "$lib_ssl" = "yes" -a -n "$SSL_LIBS@"; then
-        YAZLALIB="${yaz_build_root}/src/libyazssl.la"
-    fi

     if test "$lib_thread" = "yes" -a -n "@CFLAGSTHREADS@"; then
         YAZLALIB="${yaz_build_root}/src/libyazthread.la $YAZLALIB"
     fi
     if test "$lib_thread" = "yes" -a -n "@CFLAGSTHREADS@"; then
         YAZLALIB="${yaz_build_root}/src/libyazthread.la $YAZLALIB"
     fi

@@ -129,9 +116,7 @@ if test "$lib_thread" = "yes"; then
     YAZINC="$YAZINC @CFLAGSTHREADS@"
 fi
 
     YAZINC="$YAZINC @CFLAGSTHREADS@"
 fi
 

-if test "$lib_ssl" = "yes"; then
-    YAZINC="$YAZINC @SSL_CFLAGS@"
-fi
+YAZINC="$YAZINC @SSL_CFLAGS@"

 
 if test "$yaz_echo_help" = "yes"; then
        usage 1 1>&2
 
 if test "$yaz_echo_help" = "yes"; then
        usage 1 1>&2