X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=configure.in;h=25cc0a42457f555a4f4c6dfa832c3685706cc178;hb=694c50e2c266f90eeb265fa5612c65c94d84c2e4;hp=6f82b864fe47ae4e65d4f0213d9c9739a9dad085;hpb=77686142af94172d1887190ebd47aeb53f704057;p=idzebra-moved-to-github.git diff --git a/configure.in b/configure.in index 6f82b86..25cc0a4 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ -dnl Zebra, Index Data Aps, 1994-2000 -dnl $Id: configure.in,v 1.29 2001-10-15 19:53:43 adam Exp $ +dnl Zebra, Index Data Aps, 1994-2002 +dnl $Id: configure.in,v 1.34 2002-04-05 19:45:20 adam Exp $ dnl AC_INIT(include/zebraver.h) AC_MSG_CHECKING(for package) @@ -7,24 +7,12 @@ if test -r ${srcdir}/LICENSE.zmbol; then AC_MSG_RESULT([Z'mbol]) PROGPREFIX=zmbol AC_DEFINE(ZMBOL,1) - AM_INIT_AUTOMAKE(zmbol,1.1) + AM_INIT_AUTOMAKE(zmbol,1.2.0) else AC_MSG_RESULT([Zebra]) PROGPREFIX=zebra AC_DEFINE(ZMBOL,0) - AM_INIT_AUTOMAKE(zebra,1.1) - if test ! -r ${srcdir}/isam; then - mkdir ${srcdir}/isam - fi - touch ${srcdir}/isam/Makefile.in - if test ! -r ${srcdir}/isamc; then - mkdir ${srcdir}/isamc - fi - touch ${srcdir}/isamc/Makefile.in - if test ! -r ${srcdir}/isamb; then - mkdir ${srcdir}/isamb - fi - touch ${srcdir}/isamb/Makefile.in + AM_INIT_AUTOMAKE(zebra,1.2.0) fi AM_CONDITIONAL(ISZMBOL,test $PACKAGE = zmbol) dnl ------ Substitutions @@ -61,7 +49,10 @@ if test -r ${tclconfig}/tclConfig.sh; then if test -r ${tclconfig}/../generic/tcl.h; then TCL_INCLUDE=-I${tclconfig}/../generic TCL_LIB="$TCL_BUILD_LIB_SPEC $TCL_LIBS" - else + elif test -d ${TCL_PREFIX}/include/tcl${TCL_VERSION}; then + TCL_INCLUDE=-I${TCL_PREFIX}/include/tcl${TCL_VERSION} + TCL_LIB="$TCL_LIB_SPEC $TCL_LIBS" + else TCL_INCLUDE=-I${TCL_PREFIX}/include TCL_LIB="$TCL_LIB_SPEC $TCL_LIBS" fi @@ -78,6 +69,8 @@ fi dnl dnl ------ times AC_CHECK_HEADERS(sys/times.h) +dnl ------ mkstemp +AC_CHECK_FUNCS(mkstemp) dnl dnl ------- BZIP2 AC_CHECK_LIB(bz2,bzCompressInit) @@ -152,5 +145,5 @@ AC_OUTPUT([ include/Makefile tab/Makefile doc/Makefile - test/Makefile test/gils/Makefile test/usmarc/Makefile + test/Makefile test/gils/Makefile test/usmarc/Makefile test/api/Makefile ])