projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove unused variable
[yaz-moved-to-github.git]
/
yaz-config.in
diff --git
a/yaz-config.in
b/yaz-config.in
index
6f2cd24
..
7824d02
100644
(file)
--- a/
yaz-config.in
+++ b/
yaz-config.in
@@
-1,17
+1,16
@@
#!/bin/sh
#!/bin/sh
-# $Id: yaz-config.in,v 1.10 2001-10-15 20:37:08 adam Exp $
+# $Id: yaz-config.in,v 1.16 2003-02-12 15:06:42 adam Exp $
yazprefix=@prefix@
yaz_echo_cflags=no
yaz_echo_libs=no
yaz_echo_help=no
yazprefix=@prefix@
yaz_echo_cflags=no
yaz_echo_libs=no
yaz_echo_help=no
-yaz_echo_tabs=no
yaz_echo_source=yes
yaz_echo_lalibs=no
yaz_echo_comp=no
yaz_src_root=@YAZ_SRC_ROOT@
yaz_build_root=@YAZ_BUILD_ROOT@
yaz_echo_source=yes
yaz_echo_lalibs=no
yaz_echo_comp=no
yaz_src_root=@YAZ_SRC_ROOT@
yaz_build_root=@YAZ_BUILD_ROOT@
-yazextralibs="@LIBS@"
+yazextralibs="@XSLT_LIB@ @LIBS@"
YAZVERSION=@VERSION@
usage()
YAZVERSION=@VERSION@
usage()
@@
-24,10
+23,11
@@
Options:
[--libs]
[--lalibs]
[--cflags]
[--libs]
[--lalibs]
[--cflags]
- [--tabs]
[--comp]
Libraries:
threads
[--comp]
Libraries:
threads
+ malloc
+ ssl
EOF
exit $1
}
EOF
exit $1
}
@@
-60,9
+60,6
@@
while test $# -gt 0; do
--libs)
yaz_echo_libs=yes
;;
--libs)
yaz_echo_libs=yes
;;
- --tabs)
- yaz_echo_tabs=yes
- ;;
--lalibs)
yaz_echo_lalibs=yes
;;
--lalibs)
yaz_echo_lalibs=yes
;;
@@
-72,6
+69,12
@@
while test $# -gt 0; do
threads)
lib_thread=yes
;;
threads)
lib_thread=yes
;;
+ malloc)
+ lib_malloc=yes
+ ;;
+ ssl)
+ lib_ssl=yes
+ ;;
-*)
yaz_echo_help=yes
;;
-*)
yaz_echo_help=yes
;;
@@
-79,25
+82,38
@@
while test $# -gt 0; do
shift
done
shift
done
+lyaz="-lyaz"
+
if test "$lib_thread" = "yes" -a -n "@CFLAGSTHREADS@"; then
yazextralibs="@LIBTHREAD@ $yazextralibs"
if test "$lib_thread" = "yes" -a -n "@CFLAGSTHREADS@"; then
yazextralibs="@LIBTHREAD@ $yazextralibs"
- lyaz="-lyazthread -lyaz"
-else
- lyaz="-lyaz"
+ lyaz="-lyazthread $lyaz"
fi
fi
+
+if test "$lib_malloc" = "yes"; then
+ lyaz="-lyazmalloc $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
if test "$yaz_echo_source" = "yes"; then
- YAZTAB=${yaz_src_root}/tab
YAZBIN=${yaz_build_root}/bin
YAZLIB="-L${yaz_build_root}/lib/.libs $lyaz $yazextralibs"
YAZBIN=${yaz_build_root}/bin
YAZLIB="-L${yaz_build_root}/lib/.libs $lyaz $yazextralibs"
+ YAZLALIB="${yaz_build_root}/lib/libyaz.la $yazextralibs"
+ if test "$lib_ssl" = "yes" -a -n "$SSL_LIBS@"; then
+ YAZLALIB="${yaz_build_root}/lib/libyazssl.la"
+ fi
if test "$lib_thread" = "yes" -a -n "@CFLAGSTHREADS@"; then
if test "$lib_thread" = "yes" -a -n "@CFLAGSTHREADS@"; then
- YAZLALIB="${yaz_build_root}/lib/libyazthread.la ${yaz_build_root}/lib/libyaz.la $yazextralibs"
- else
- YAZLALIB="${yaz_build_root}/lib/libyaz.la $yazextralibs"
+ YAZLALIB="${yaz_build_root}/lib/libyazthread.la $YAZLALIB"
+ fi
+ if test "$lib_malloc" = "yes"; then
+ YAZLALIB="${yaz_build_root}/lib/libyazmalloc.la $YAZLALIB"
fi
YAZINC="-I${yaz_src_root}/include"
YAZCOMP=${yaz_src_root}/util/yaz-comp
else
fi
YAZINC="-I${yaz_src_root}/include"
YAZCOMP=${yaz_src_root}/util/yaz-comp
else
- YAZTAB=${yazprefix}/share/yaz/tab
YAZBIN=${yazprefix}/bin
YAZCOMP=${yazprefix}/bin/yaz-comp
YAZBIN=${yazprefix}/bin
YAZCOMP=${yazprefix}/bin/yaz-comp
@@
-114,10
+130,16
@@
else
fi
fi
fi
fi
+YAZINC="$YAZINC @YAZ_CONF_CFLAGS@"
+
if test "$lib_thread" = "yes"; then
YAZINC="$YAZINC @CFLAGSTHREADS@"
fi
if test "$lib_thread" = "yes"; then
YAZINC="$YAZINC @CFLAGSTHREADS@"
fi
+if test "$lib_ssl" = "yes"; then
+ YAZINC="$YAZINC @SSL_CFLAGS@"
+fi
+
if test "$yaz_echo_help" = "yes"; then
usage 1 1>&2
fi
if test "$yaz_echo_help" = "yes"; then
usage 1 1>&2
fi
@@
-127,9
+149,6
@@
fi
if test "$yaz_echo_libs" = "yes"; then
echo $YAZLIB
fi
if test "$yaz_echo_libs" = "yes"; then
echo $YAZLIB
fi
-if test "$yaz_echo_tabs" = "yes"; then
- echo $YAZTAB
-fi
if test "$yaz_echo_lalibs" = "yes"; then
echo $YAZLALIB
fi
if test "$yaz_echo_lalibs" = "yes"; then
echo $YAZLALIB
fi