X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=yaz%2B%2B-config.in;h=052e1422d96629be28c87c0aaac0a5314ee76bed;hb=eea2caea1263bed0aae268f72d985cbb1822ac30;hp=2ba29415d24f1eb4f58b32be3f18b1f26f985f49;hpb=e3133d2f2c580f76c9da2e7621c74a064f0955c9;p=yazpp-moved-to-github.git

diff --git a/yaz++-config.in b/yaz++-config.in
index 2ba2941..052e142 100644
--- a/yaz++-config.in
+++ b/yaz++-config.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: yaz++-config.in,v 1.1 2000-10-11 11:58:16 adam Exp $
+# $Id: yaz++-config.in,v 1.7 2004-03-29 22:46:50 adam Exp $
 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@
+yazpp_build_root=@YAZPP_BUILD_ROOT@
 
 yazlibs="@YAZLIB@ @LIBS@"
+yazlalibs="@YAZLALIB@ @LIBS@"
 YAZPPVERSION=@VERSION@
 
 usage()
@@ -26,9 +28,9 @@ EOF
 	exit $1
 }
 
-#if test $# -eq 0; then
-#	yaz_echo_help=yes
-#fi
+if test $# -eq 0; then
+	yaz_echo_help=yes
+fi
 
 while test $# -gt 0; do
   case "$1" in
@@ -57,9 +59,6 @@ while test $# -gt 0; do
     --tabs)
       yaz_echo_tabs=yes
       ;;
-    --source)
-      yaz_echo_source=yes
-      ;;
     --lalibs)
       yaz_echo_lalibs=yes
       ;;
@@ -70,16 +69,20 @@ while test $# -gt 0; do
   shift
 done
 
+libs_short="-lyazcpp -lzoomcpp"
+
 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 -lyazcpp"
+    YAZPPLIB="$YAZPPLIB -L${yazpp_build_root}/zoom/.libs -lzoomcpp"
+    YAZPPLIB="$YAZPPLIB $yazlibs"
+    YAZPPLALIB="${yazpp_build_root}/src/libyazcpp.la $yazlalibs"
     YAZPPINC="@YAZINC@ -I${yazpp_src_root}/include"
 else
 
     if test "$yazppprefix" = "/usr"; then
-	YAZPPLIB="-lyaz++ $yazlibs"
+	YAZPPLIB="${libs_short} $yazlibs"
     else
-	YAZPPLIB="-L${yazppprefix}/lib -lyaz++ $yazlibs"
+	YAZPPLIB="-L${yazppprefix}/lib ${libs_short} $yazlibs"
     fi
     YAZPPLALIB=$YAZPPLIB
     if test "$yazppprefix" = "/usr"; then