Fix setting of automake ISTHR to reflect POSIX thread availability

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

diff --git a/configure.in b/configure.in
index bb6b848..1b8765f 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.74 2003-04-15 20:47:05 adam Exp $
+dnl $Id: configure.in,v 1.79 2003-05-26 20:07:40 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)
@@ -76,7 +76,11 @@ 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
@@ -112,6 +116,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 +309,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)
@@ -392,7 +397,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
+