projects
/
yazpp-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Separate libs. Update version
[yazpp-moved-to-github.git]
/
yaz++-config.in
diff --git
a/yaz++-config.in
b/yaz++-config.in
index
2ba2941
..
ef654bb
100644
(file)
--- a/
yaz++-config.in
+++ b/
yaz++-config.in
@@
-1,5
+1,5
@@
#!/bin/sh
#!/bin/sh
-# $Id: yaz++-config.in,v 1.1 2000-10-11 11:58:16 adam Exp $
+# $Id: yaz++-config.in,v 1.5 2004-02-11 10:01:54 adam Exp $
yazppprefix=@prefix@
yaz_echo_cflags=no
yaz_echo_libs=no
yazppprefix=@prefix@
yaz_echo_cflags=no
yaz_echo_libs=no
@@
-8,8
+8,10
@@
yaz_echo_tabs=no
yaz_echo_source=yes
yaz_echo_lalibs=no
yazpp_src_root=@YAZPP_SRC_ROOT@
yaz_echo_source=yes
yaz_echo_lalibs=no
yazpp_src_root=@YAZPP_SRC_ROOT@
+yazpp_build_root=@YAZPP_BUILD_ROOT@
yazlibs="@YAZLIB@ @LIBS@"
yazlibs="@YAZLIB@ @LIBS@"
+yazlalibs="@YAZLALIB@ @LIBS@"
YAZPPVERSION=@VERSION@
usage()
YAZPPVERSION=@VERSION@
usage()
@@
-57,9
+59,6
@@
while test $# -gt 0; do
--tabs)
yaz_echo_tabs=yes
;;
--tabs)
yaz_echo_tabs=yes
;;
- --source)
- yaz_echo_source=yes
- ;;
--lalibs)
yaz_echo_lalibs=yes
;;
--lalibs)
yaz_echo_lalibs=yes
;;
@@
-70,16
+69,18
@@
while test $# -gt 0; do
shift
done
shift
done
+libs_short="-lyazcpp -lzoomcpp"
+
if test "$yaz_echo_source" = "yes"; then
if test "$yaz_echo_source" = "yes"; then
- YAZPPLIB="-L${yazpp_src_root}/src/.libs -lyaz++ $yazlibs"
- YAZPPLALIB="${yazpp_src_root}/src/libyaz++.la $yazlibs"
+ YAZPPLIB="-L${yazpp_build_root}/src/.libs ${libs_short} $yazlibs"
+ YAZPPLALIB="${yazpp_build_root}/src/libyazcpp.la $yazlalibs"
YAZPPINC="@YAZINC@ -I${yazpp_src_root}/include"
else
if test "$yazppprefix" = "/usr"; then
YAZPPINC="@YAZINC@ -I${yazpp_src_root}/include"
else
if test "$yazppprefix" = "/usr"; then
- YAZPPLIB="-lyaz++ $yazlibs"
+ YAZPPLIB="${libs_short} $yazlibs"
else
else
- YAZPPLIB="-L${yazppprefix}/lib -lyaz++ $yazlibs"
+ YAZPPLIB="-L${yazppprefix}/lib ${libs_short} $yazlibs"
fi
YAZPPLALIB=$YAZPPLIB
if test "$yazppprefix" = "/usr"; then
fi
YAZPPLALIB=$YAZPPLIB
if test "$yazppprefix" = "/usr"; then