X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=c18e44314fc068fc0cd3d46aca3d66b78bdb81a7;hb=cd3ce7da1b13a23dc0f01b24abb9e52f87a12261;hp=6e3dacfa5a959f3fdab3328d7c58306dfde050ce;hpb=403ae06f9dbf8180008ccc8128f642203d41ae50;p=idzebra-moved-to-github.git diff --git a/configure.in b/configure.in index 6e3dacf..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.78 2003-05-21 14:39:21 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) @@ -71,14 +71,11 @@ 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) - 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 @@ -364,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 @@ -374,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 @@ -389,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