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
f0ec873
..
9cd2b87
100644
(file)
--- a/
yaz-config.in
+++ b/
yaz-config.in
@@
-1,22
+1,27
@@
#!/bin/sh
#!/bin/sh
-# $Id: yaz-config.in,v 1.11 2001-11-13 23:00:42 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
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@"
+PTHREAD_LIBS="@PTHREAD_LIBS@"
+PTHREAD_CFLAGS="@PTHREAD_CFLAGS@"
+ICU_LIBS="@ICU_LIBS@"
+ICU_CPPFLAGS="@ICU_CPPFLAGS@"
+SSL_LIBS="@SSL_LIBS@"
+LIBS="@LIBS@"
YAZVERSION=@VERSION@
usage()
{
YAZVERSION=@VERSION@
usage()
{
- cat <<EOF
+ cat <<EOF
Usage: yaz-config [OPTIONS] [LIBRARIES]
Options:
[--prefix[=DIR]]
Usage: yaz-config [OPTIONS] [LIBRARIES]
Options:
[--prefix[=DIR]]
@@
-24,126
+29,143
@@
Options:
[--libs]
[--lalibs]
[--cflags]
[--libs]
[--lalibs]
[--cflags]
- [--tabs]
[--comp]
Libraries:
[--comp]
Libraries:
- threads
- malloc
+ threads icu server
EOF
exit $1
}
EOF
exit $1
}
-#if test $# -eq 0; then
-# yaz_echo_help=yes
-#fi
-
while test $# -gt 0; do
while test $# -gt 0; do
- case "$1" in
- -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
- *) optarg= ;;
- esac
-
- case $1 in
- --prefix=*)
- yazprefix=$optarg
- ;;
- --prefix)
- echo $yazprefix
- exit 0
- ;;
- --version)
- echo $YAZVERSION
- exit 0
- ;;
- --cflags)
- yaz_echo_cflags=yes
- ;;
- --libs)
- yaz_echo_libs=yes
- ;;
- --tabs)
- yaz_echo_tabs=yes
- ;;
- --lalibs)
- yaz_echo_lalibs=yes
- ;;
- --comp)
- yaz_echo_comp=yes
- ;;
- threads)
- lib_thread=yes
- ;;
- malloc)
- lib_malloc=yes
- ;;
- -*)
- yaz_echo_help=yes
- ;;
- esac
- shift
+ case "$1" in
+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+ *) optarg= ;;
+ esac
+
+ case $1 in
+ --prefix=*)
+ yazprefix=$optarg
+ ;;
+ --prefix)
+ echo $yazprefix
+ exit 0
+ ;;
+ --version)
+ echo $YAZVERSION
+ exit 0
+ ;;
+ --cflags)
+ yaz_echo_cflags=yes
+ ;;
+ --libs)
+ yaz_echo_libs=yes
+ ;;
+ --lalibs)
+ yaz_echo_lalibs=yes
+ ;;
+ --comp)
+ yaz_echo_comp=yes
+ ;;
+ threads)
+ lib_thread=yes
+ ;;
+ icu)
+ if test "$ICU_CPPFLAGS"; then
+ lib_icu=yes
+ fi
+ ;;
+ server)
+ lib_thread=yes
+ lib_server=yes
+ ;;
+ static)
+ lib_static=yes
+ ;;
+ -*)
+ yaz_echo_help=yes
+ ;;
+ esac
+ shift
done
lyaz="-lyaz"
done
lyaz="-lyaz"
+if test "$lib_server" = "yes"; then
+ lyaz="-lyaz_server $lyaz"
+fi
-if test "$lib_thread" = "yes" -a -n "@CFLAGSTHREADS@"; then
- yazextralibs="@LIBTHREAD@ $yazextralibs"
- lyaz="-lyazthread $lyaz"
-fi
-
-if test "$lib_malloc" = "yes"; then
- lyaz="-lyazmalloc $lyaz"
+if test "$lib_icu" = "yes"; then
+ lyaz="-lyaz_icu $lyaz"
fi
fi
+YAZINC="@YAZ_CONFIG_CFLAGS@"
+
if test "$yaz_echo_source" = "yes"; then
if test "$yaz_echo_source" = "yes"; then
- YAZTAB=${yaz_src_root}/tab
YAZBIN=${yaz_build_root}/bin
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_thread" = "yes" -a -n "@CFLAGSTHREADS@"; then
- YAZLALIB="${yaz_build_root}/lib/libyazthread.la $YAZLALIB"
+
+ if test "$lib_static" = "yes"; then
+ 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
+ else
+ YAZLIB="-L${yaz_build_root}/src/.libs $lyaz"
fi
fi
- if test "$lib_malloc" = "yes"; then
- YAZLALIB="${yaz_build_root}/lib/libyazmalloc.la $YAZLALIB"
+ 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
+ if test "$lib_icu" = "yes"; then
+ YAZLALIB="${yaz_build_root}/src/libyaz_icu.la $YAZLALIB"
fi
fi
- YAZINC="-I${yaz_src_root}/include"
- YAZCOMP=${yaz_src_root}/util/yaz-comp
+ YAZLALIB="$YAZLALIB $LIBS"
+
+ YAZINC="-I${yaz_src_root}/include $YAZINC"
+ YAZCOMP=${yaz_src_root}/util/yaz-asncomp
else
else
- YAZTAB=${yazprefix}/share/yaz/tab
YAZBIN=${yazprefix}/bin
YAZBIN=${yazprefix}/bin
- YAZCOMP=${yazprefix}/bin/yaz-comp
+ YAZCOMP=${yazprefix}/bin/yaz-asncomp
- if test "$yazprefix" = "/usr"; then
- YAZLIB="$lyaz $yazextralibs"
- else
- YAZLIB="-L$yazprefix/lib $lyaz $yazextralibs"
+ if test "$yazprefix" != "/usr"; then
+ YAZLIB="-L$yazprefix/lib"
fi
fi
+ YAZLIB="$YAZLIB $lyaz $LIBS"
YAZLALIB=$YAZLIB
YAZLALIB=$YAZLIB
- if test "$yazprefix" = "/usr"; then
- YAZINC=
- else
- YAZINC=-I$yazprefix/include
+ if test "$yazprefix" != "/usr"; then
+ YAZINC="-I$yazprefix/include $YAZINC"
fi
fi
if test "$lib_thread" = "yes"; then
fi
fi
if test "$lib_thread" = "yes"; then
- YAZINC="$YAZINC @CFLAGSTHREADS@"
+ YAZINC="$PTHREAD_CFLAGS $YAZINC"
+ YAZLIB="$YAZLIB $PTHREAD_LIBS"
+ 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
fi
if test "$yaz_echo_help" = "yes"; then
- usage 1 1>&2
+ usage 1 1>&2
fi
if test "$yaz_echo_cflags" = "yes"; then
fi
if test "$yaz_echo_cflags" = "yes"; then
- echo $YAZINC
+ echo $YAZINC
fi
if test "$yaz_echo_libs" = "yes"; then
fi
if test "$yaz_echo_libs" = "yes"; then
- echo $YAZLIB
-fi
-if test "$yaz_echo_tabs" = "yes"; then
- echo $YAZTAB
+ echo $YAZLIB
fi
if test "$yaz_echo_lalibs" = "yes"; then
fi
if test "$yaz_echo_lalibs" = "yes"; then
- echo $YAZLALIB
+ echo $YAZLALIB
fi
if test "$yaz_echo_comp" = "yes"; then
fi
if test "$yaz_echo_comp" = "yes"; then
- echo $YAZCOMP
+ echo $YAZCOMP
fi
fi
+# Local Variables:
+# mode:shell-script
+# sh-indentation: 2
+# sh-basic-offset: 4
+# End: