Improved yaz-config for build in any place.

diff --git a/configure.in b/configure.in
index e264fdd..6e888a7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl YAZ Toolkit, Index Data 1994-2000
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.40 2001-02-21 09:03:34 adam Exp $
+dnl $Id: configure.in,v 1.41 2001-03-20 15:58:23 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
 AM_INIT_AUTOMAKE(yaz, 1.7)
 dnl
@@ -140,15 +140,17 @@ fi
 AM_CONDITIONAL(ISTHR, test $HAVETHREADS = "1")
 dnl ------ Using this for "in-source" yaz-config
 AC_SUBST(YAZ_SRC_ROOT)
-YAZ_SRC_ROOT=`pwd`
+AC_SUBST(YAZ_BUILD_ROOT)
+YAZ_SRC_ROOT=`cd ${srcdir}; pwd`
+YAZ_BUILD_ROOT=`pwd`
 dnl
-SUBDIRS_VAR="util odr $ASNMODULE $ILLMODULE zutil comstack ccl tab retrieval server include lib client ztest"
-AC_SUBST(SUBDIRS_VAR)
-if test -f lib/yaz-config.in; then
-       rm lib/yaz-config.in
+if test -f ${srcdir}/lib/yaz-config.in; then
+       rm ${srcdir}/lib/yaz-config.in
 fi
-sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz-config.in >lib/yaz-config.in
+sed s%yaz_echo_source=yes%yaz_echo_source=no%g < ${srcdir}/yaz-config.in >${srcdir}/lib/yaz-config.in
 dnl
+SUBDIRS_VAR="util odr $ASNMODULE $ILLMODULE zutil comstack ccl tab retrieval server include lib client ztest"
+AC_SUBST(SUBDIRS_VAR)
 dnl ------ Makefiles
 dnl
 AC_OUTPUT([

diff --git a/yaz-config.in b/yaz-config.in
index cb9e89f..99e2ed2 100644 (file)
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: yaz-config.in,v 1.5 2000-12-14 16:01:32 adam Exp $
+# $Id: yaz-config.in,v 1.6 2001-03-20 15:58:24 adam Exp $
 yazprefix=@prefix@
 yaz_echo_cflags=no
 yaz_echo_libs=no
@@ -8,6 +8,7 @@ yaz_echo_tabs=no
 yaz_echo_source=yes
 yaz_echo_lalibs=no
 yaz_src_root=@YAZ_SRC_ROOT@
+yaz_build_root=@YAZ_BUILD_ROOT@
 
 yazextralibs="@LIBS@"
 YAZVERSION=@VERSION@
@@ -81,12 +82,12 @@ else
 fi 
 if test "$yaz_echo_source" = "yes"; then
     YAZTAB=${yaz_src_root}/tab
-    YAZBIN=${yaz_src_root}/bin
-    YAZLIB="-L${yaz_src_root}/lib/.libs $lyaz $yazextralibs"
+    YAZBIN=${yaz_build_root}/bin
+    YAZLIB="-L${yaz_build_root}/lib/.libs $lyaz $yazextralibs"
     if test "$lib_thread" = "yes"; then
-        YAZLALIB="${yaz_src_root}/lib/libyazthread.la ${yaz_src_root}/lib/libyaz.la $yazextralibs"
+        YAZLALIB="${yaz_build_root}/lib/libyazthread.la ${yaz_build_root}/lib/libyaz.la $yazextralibs"
     else
-        YAZLALIB="${yaz_src_root}/lib/libyaz.la $yazextralibs"
+        YAZLALIB="${yaz_build_root}/lib/libyaz.la $yazextralibs"
     fi
     YAZINC="-I${yaz_src_root}/include"
 else