X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=c18e44314fc068fc0cd3d46aca3d66b78bdb81a7;hb=1cc0116831e49bf70538639a8fc9b08b9524c683;hp=1b8765f17da705ff9c6cdab1fd55ce8cd09b8d0c;hpb=202f71c87b756c4d4f3d604737ca89c9ba08409b;p=idzebra-moved-to-github.git diff --git a/configure.in b/configure.in index 1b8765f..c18e443 100644 --- a/configure.in +++ b/configure.in @@ -1,8 +1,8 @@ -dnl Zebra, Index Data Aps, 1995-2003 -dnl $Id: configure.in,v 1.79 2003-05-26 20:07:40 adam Exp $ +dnl Zebra, Index Data Aps, 1995-2004 +dnl $Id: configure.in,v 1.97 2004-08-30 21:35:27 adam Exp $ dnl -AC_INIT(include/zebraver.h) -AM_INIT_AUTOMAKE(idzebra,1.3.11) +AC_INIT(include/idzebra/version.h) +AM_INIT_AUTOMAKE(idzebra,1.4.0) dnl ------ Substitutions AC_SUBST(TCL_INCLUDE) AC_SUBST(TCL_LIB) @@ -18,8 +18,8 @@ dnl dnl ------ Checking programs AC_PROG_CC AC_PROG_CPP -AC_PROG_INSTALL -AC_PROG_RANLIB +AM_DISABLE_SHARED +AM_PROG_LIBTOOL dnl dnl ----- DOCBOOK DTD AC_SUBST(DTD_DIR) @@ -76,11 +76,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 +361,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 +375,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 @@ -391,12 +389,15 @@ 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 -]) + 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