X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=6689c38fd7011e18f3cc3b60e80da7ddacfda425;hb=cd3f39bbae63668b8806ed205132da166e73102f;hp=bb6b848743aed1ad30cad449ea2aece51f96b683;hpb=cc8dce2e2405e3d831c44c8bf0cd3923386266c2;p=idzebra-moved-to-github.git

diff --git a/configure.in b/configure.in
index bb6b848..6689c38 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
-dnl Zebra, Index Data Aps, 1995-2003
-dnl $Id: configure.in,v 1.74 2003-04-15 20:47:05 adam Exp $
+dnl Zebra, Index Data Aps, 1995-2004
+dnl $Id: configure.in,v 1.91 2004-06-11 10:36:08 adam Exp $
 dnl
 AC_INIT(include/zebraver.h)
-AM_INIT_AUTOMAKE(idzebra,1.3.10)
+AM_INIT_AUTOMAKE(idzebra,1.3.16)
 dnl ------ Substitutions
 AC_SUBST(TCL_INCLUDE)
 AC_SUBST(TCL_LIB)
@@ -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
@@ -304,7 +304,7 @@ if test "$perl" != "no"; then
 		],AM_CONDITIONAL(perl,true)
 	          AC_DEFINE(HAVE_PERL,1)
 		  AC_MSG_RESULT(found)
-	          ZPERL_LIBS="$LIBS"
+	          ZPERL_LIBS="$xLIBS"
 			,
                   AC_MSG_RESULT(not found)
 	          AC_DEFINE(HAVE_PERL,0)
@@ -386,13 +386,19 @@ 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
 ])
-
 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
+