X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=100c5919448cc5e9d21ca80a0acc153e4f989814;hb=45188c35bebda2cd4f91ffd7c09fdb9cae973dab;hp=8dc933498ebccd8726f61fb5eccc9287096ac1d1;hpb=8f611f1ada2fb8cfda909be015032c924cfed42a;p=idzebra-moved-to-github.git diff --git a/configure.in b/configure.in index 8dc9334..100c591 100644 --- a/configure.in +++ b/configure.in @@ -1,8 +1,9 @@ -dnl Zebra, Index Data Aps, 1995-2003 -dnl $Id: configure.in,v 1.83 2003-09-16 12:18:24 adam Exp $ +dnl Zebra, Index Data Aps, 1995-2004 +dnl $Id: configure.in,v 1.96 2004-08-29 12:31:32 adam Exp $ dnl -AC_INIT(include/zebraver.h) -AM_INIT_AUTOMAKE(idzebra,1.3.12) +AC_INIT(include/idzebra/version.h) +AM_INIT_AUTOMAKE(idzebra,1.4.0) +AM_PROG_LIBTOOL dnl ------ Substitutions AC_SUBST(TCL_INCLUDE) AC_SUBST(TCL_LIB) @@ -76,11 +77,6 @@ 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 @@ -366,6 +362,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 @@ -376,13 +376,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 @@ -395,9 +394,11 @@ AC_OUTPUT([ test/config/Makefile perl/Makefile.PL test/xelm/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 .. ;`; fi