X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=c18e44314fc068fc0cd3d46aca3d66b78bdb81a7;hb=cd3ce7da1b13a23dc0f01b24abb9e52f87a12261;hp=535357f378fbafdd08aa9fb3b4fc09a6abbb5031;hpb=5865cb46d40433f1ca179164ef50c5222bc52880;p=idzebra-moved-to-github.git

diff --git a/configure.in b/configure.in
index 535357f..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.75 2003-04-15 20:56:47 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.10)
+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,7 +76,6 @@ else
 	yazflag=""
 fi
 YAZ_INIT($yazflag)
-
 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
@@ -112,6 +111,7 @@ if test -r ${tclconfig}/tclConfig.sh; then
 		TCL_INCLUDE=-I${TCL_PREFIX}/include
 		TCL_LIB="$TCL_LIB_SPEC $TCL_LIBS"
 	fi
+	TCL_LIB=`echo $TCL_LIB|sed 's%-L/usr/lib%%g'`
         SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS
         SHLIB_LD=$TCL_SHLIB_LD
         SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX
@@ -361,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
@@ -371,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
@@ -386,13 +389,20 @@ AC_OUTPUT([
   doc/zebraphp.dsl
   doc/tkl.xsl
   test/Makefile test/gils/Makefile test/usmarc/Makefile test/api/Makefile
-  test/rusmarc/Makefile test/cddb/Makefile
+  test/rusmarc/Makefile test/cddb/Makefile test/malxml/Makefile 
+  test/config/Makefile
   perl/Makefile.PL test/xelm/Makefile
-  test/dmoz/Makefile test/xpath/Makefile test/sort/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 .. ;`;
+	res=`cd perl ; $perlbin Makefile.PL ; cd .. ;`;
 fi
+if test  -z "$YAZLIB"; then
+	echo "YAZ was not found. Use --with-yazconfig=DIR to specify location."
+	test -f /etc/debian_version && echo "Debian package libyaz-dev is required."
+fi
+