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
Fixed description
[yaz-moved-to-github.git]
/
yaz-config.in
diff --git
a/yaz-config.in
b/yaz-config.in
index
5eba756
..
9cd2b87
100644
(file)
--- a/
yaz-config.in
+++ b/
yaz-config.in
@@
-1,5
+1,7
@@
#!/bin/sh
#!/bin/sh
-# $Id: yaz-config.in,v 1.30 2007-04-18 18:46:37 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
yazprefix=@prefix@
yaz_echo_cflags=no
yaz_echo_libs=no
@@
-11,8
+13,10
@@
yaz_src_root=@YAZ_SRC_ROOT@
yaz_build_root=@YAZ_BUILD_ROOT@
PTHREAD_LIBS="@PTHREAD_LIBS@"
PTHREAD_CFLAGS="@PTHREAD_CFLAGS@"
yaz_build_root=@YAZ_BUILD_ROOT@
PTHREAD_LIBS="@PTHREAD_LIBS@"
PTHREAD_CFLAGS="@PTHREAD_CFLAGS@"
-
-yazextralibs="@LIBS@"
+ICU_LIBS="@ICU_LIBS@"
+ICU_CPPFLAGS="@ICU_CPPFLAGS@"
+SSL_LIBS="@SSL_LIBS@"
+LIBS="@LIBS@"
YAZVERSION=@VERSION@
usage()
YAZVERSION=@VERSION@
usage()
@@
-27,7
+31,7
@@
Options:
[--cflags]
[--comp]
Libraries:
[--cflags]
[--comp]
Libraries:
- threads
+ threads icu server
EOF
exit $1
}
EOF
exit $1
}
@@
-65,6
+69,11
@@
while test $# -gt 0; do
threads)
lib_thread=yes
;;
threads)
lib_thread=yes
;;
+ icu)
+ if test "$ICU_CPPFLAGS"; then
+ lib_icu=yes
+ fi
+ ;;
server)
lib_thread=yes
lib_server=yes
server)
lib_thread=yes
lib_server=yes
@@
-84,6
+93,10
@@
if test "$lib_server" = "yes"; then
lyaz="-lyaz_server $lyaz"
fi
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
YAZINC="@YAZ_CONFIG_CFLAGS@"
if test "$yaz_echo_source" = "yes"; then
@@
-97,13
+110,16
@@
if test "$yaz_echo_source" = "yes"; then
else
YAZLIB="-L${yaz_build_root}/src/.libs $lyaz"
fi
else
YAZLIB="-L${yaz_build_root}/src/.libs $lyaz"
fi
- YAZLIB="$YAZLIB $yazextralibs"
+ YAZLIB="$YAZLIB ${SSL_LIBS} $LIBS"
YAZLALIB="${yaz_build_root}/src/libyaz.la"
if test "$lib_server" = "yes"; then
YAZLALIB="${yaz_build_root}/src/libyaz_server.la $YAZLALIB"
fi
YAZLALIB="${yaz_build_root}/src/libyaz.la"
if test "$lib_server" = "yes"; then
YAZLALIB="${yaz_build_root}/src/libyaz_server.la $YAZLALIB"
fi
- YAZLALIB="$YAZLALIB $yazextralibs"
+ if test "$lib_icu" = "yes"; then
+ YAZLALIB="${yaz_build_root}/src/libyaz_icu.la $YAZLALIB"
+ fi
+ YAZLALIB="$YAZLALIB $LIBS"
YAZINC="-I${yaz_src_root}/include $YAZINC"
YAZCOMP=${yaz_src_root}/util/yaz-asncomp
YAZINC="-I${yaz_src_root}/include $YAZINC"
YAZCOMP=${yaz_src_root}/util/yaz-asncomp
@@
-114,7
+130,7
@@
else
if test "$yazprefix" != "/usr"; then
YAZLIB="-L$yazprefix/lib"
fi
if test "$yazprefix" != "/usr"; then
YAZLIB="-L$yazprefix/lib"
fi
- YAZLIB="$YAZLIB $lyaz $yazextralibs"
+ YAZLIB="$YAZLIB $lyaz $LIBS"
YAZLALIB=$YAZLIB
if test "$yazprefix" != "/usr"; then
YAZINC="-I$yazprefix/include $YAZINC"
YAZLALIB=$YAZLIB
if test "$yazprefix" != "/usr"; then
YAZINC="-I$yazprefix/include $YAZINC"
@@
-127,6
+143,12
@@
if test "$lib_thread" = "yes"; then
YAZLALIB="$YAZLALIB $PTHREAD_LIBS"
fi
YAZLALIB="$YAZLALIB $PTHREAD_LIBS"
fi
+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
usage 1 1>&2
fi
if test "$yaz_echo_help" = "yes"; then
usage 1 1>&2
fi