Makefile updates for Automake 1.5+. Test script updates

[idzebra-moved-to-github.git] / configure.in

diff --git a/configure.in b/configure.in
index 535357f..6e3dacf 100644 (file)
--- 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 $Id: configure.in,v 1.78 2003-05-21 14:39:21 adam Exp $
 dnl
 AC_INIT(include/zebraver.h)
-AM_INIT_AUTOMAKE(idzebra,1.3.10)
+AM_INIT_AUTOMAKE(idzebra,1.3.11)
 dnl ------ Substitutions
 AC_SUBST(TCL_INCLUDE)
 AC_SUBST(TCL_LIB)
@@ -71,8 +71,10 @@ AC_ARG_WITH(dsssl,[  --with-dsssl[=DIR]      Use DSSSL in DIR/{html,print}/docbo
 dnl
 AC_ARG_ENABLE(threads, [  --disable-threads       disable threads],[enable_threads=$enableval],[enable_threads=yes])
 if test "$enable_threads" = "yes"; then
+       AM_CONDITIONAL(ISTHR,true)
        yazflag=threads
 else
+       AM_CONDITIONAL(ISTHR,false)
        yazflag=""
 fi
 YAZ_INIT($yazflag)
@@ -112,6 +114,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
@@ -392,7 +395,11 @@ AC_OUTPUT([
   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
+