X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=c18e44314fc068fc0cd3d46aca3d66b78bdb81a7;hb=3e8db66d56c466a5a269362eb70b4931d9579128;hp=8dc933498ebccd8726f61fb5eccc9287096ac1d1;hpb=8f611f1ada2fb8cfda909be015032c924cfed42a;p=idzebra-moved-to-github.git

diff --git a/configure.in b/configure.in
index 8dc9334..c18e443 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
-dnl Zebra, Index Data Aps, 1995-2003
-dnl $Id: configure.in,v 1.83 2003-09-16 12:18:24 adam Exp $
+dnl Zebra, Index Data Aps, 1995-2004
+dnl $Id: configure.in,v 1.97 2004-08-30 21:35:27 adam Exp $
 dnl
-AC_INIT(include/zebraver.h)
-AM_INIT_AUTOMAKE(idzebra,1.3.12)
+AC_INIT(include/idzebra/version.h)
+AM_INIT_AUTOMAKE(idzebra,1.4.0)
 dnl ------ Substitutions
 AC_SUBST(TCL_INCLUDE)
 AC_SUBST(TCL_LIB)
@@ -18,8 +18,8 @@ dnl
 dnl ------ Checking programs
 AC_PROG_CC
 AC_PROG_CPP
-AC_PROG_INSTALL
-AC_PROG_RANLIB
+AM_DISABLE_SHARED
+AM_PROG_LIBTOOL
 dnl
 dnl ----- DOCBOOK DTD
 AC_SUBST(DTD_DIR)
@@ -76,11 +76,6 @@ else
 	yazflag=""
 fi
 YAZ_INIT($yazflag)
-if echo "$YAZINC"|grep YAZ_POSIX_THREADS=1 >/dev/null; then
-	AM_CONDITIONAL(ISTHR,true)
-else
-	AM_CONDITIONAL(ISTHR,false)
-fi	
 dnl ------ Look for Tcl
 dnl See if user has specified location of tclConfig.sh; otherwise
 dnl see if tclConfig.sh exists in same prefix lcoation as tclsh; otherwise
@@ -366,6 +361,10 @@ AC_STDC_HEADERS
 if test "$ac_cv_header_stdc" = "no"; then
 	AC_MSG_WARN(Your system doesn't seem to support ANSI C)
 fi
+AC_SUBST(IDZEBRA_SRC_ROOT)
+AC_SUBST(IDZEBRA_BUILD_ROOT)
+IDZEBRA_SRC_ROOT=`cd ${srcdir}; pwd`
+IDZEBRA_BUILD_ROOT=`pwd`
 dnl ------ Create Makefiles
 AC_OUTPUT([
   Makefile
@@ -376,13 +375,12 @@ AC_OUTPUT([
   isamb/Makefile
   isams/Makefile
   isamc/Makefile
-  isam/Makefile
   rset/Makefile
   data1/Makefile
   recctrl/Makefile
   recctrl/perlread.h
   index/Makefile
-  include/Makefile
+  include/Makefile include/idzebra/Makefile
   tab/Makefile
   doc/Makefile
   doc/zebra.xml
@@ -395,9 +393,11 @@ AC_OUTPUT([
   test/config/Makefile
   perl/Makefile.PL test/xelm/Makefile
   test/dmoz/Makefile test/xpath/Makefile test/sort/Makefile test/zsh/Makefile
+  test/marcxml/Makefile test/charmap/Makefile test/codec/Makefile
   examples/Makefile examples/gils/Makefile examples/zthes/Makefile
   idzebra.spec
-])
+  idzebra-config
+],[sed s%idzebra_echo_source=yes%idzebra_echo_source=no%g < idzebra-config > util/idzebra-config && chmod +x idzebra-config util/idzebra-config])
 if test -x "$perlbin"; then
 	res=`cd perl ; $perlbin Makefile.PL ; cd .. ;`;
 fi