X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=configure.in;h=dcef686c94362b804204cc18ffd2e852e1e538cd;hp=42a6ad438a2c4ef136cd35719a7eca7ff7b2d8ad;hb=a78a33783fe04e47932ad2c4a10e70659b0d15f4;hpb=2ad40f2e15a4d6927833231b8dc6874b747fed2e diff --git a/configure.in b/configure.in index 42a6ad4..dcef686 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ AC_INIT(configure.in) -AM_INIT_AUTOMAKE("yaz++", 0.3) +AM_INIT_AUTOMAKE("yaz++",0.8) AC_PROG_CC AC_PROG_CPP @@ -8,12 +8,11 @@ AC_HEADER_STDC AM_DISABLE_SHARED AM_PROG_LIBTOOL -YAZ_INIT(threads) - +YAZ_INIT(threads,2.0.12) dnl dnl ----- DOCBOOK DTD AC_SUBST(DTD_DIR) -AC_ARG_WITH(dtd, [ --with-dtd[=DIR] Use docbookx.dtd in DIR], +AC_ARG_WITH(dtd, [ --with-dtd[=DIR] use docbookx.dtd in DIR], [ if test -f "$withval/docbookx.dtd"; then DTD_DIR=$withval @@ -37,7 +36,7 @@ AC_ARG_WITH(dtd, [ --with-dtd[=DIR] Use docbookx.dtd in DIR], fi ]) AC_SUBST(DSSSL_DIR) -AC_ARG_WITH(dsssl,[ --with-dsssl[=DIR] Use DSSSL in DIR/{html,print}/docbook.dsl], +AC_ARG_WITH(dsssl,[ --with-dsssl[=DIR] use DSSSL in DIR/{html,print}/docbook.dsl], [ if test -f "$withval/html/docbook.dsl"; then DSSSL_DIR=$withval @@ -60,25 +59,24 @@ AC_ARG_WITH(dsssl,[ --with-dsssl[=DIR] Use DSSSL in DIR/{html,print}/docbo ]) dnl +AC_ARG_ENABLE(zoom,[ --disable-zoom disable ZOOM (for old C++ compilers)],[enable_zoom=$enableval],[enable_zoom=yes]) +AM_CONDITIONAL(ZOOM, test $enable_zoom = "yes") AC_SUBST(YAZPP_SRC_ROOT) AC_SUBST(YAZPP_BUILD_ROOT) YAZPP_SRC_ROOT=`cd ${srcdir}; pwd` YAZPP_BUILD_ROOT=`pwd` -if test -f ${srcdir}/src/yaz++-config.in; then - rm ${srcdir}/src/yaz++-config.in -fi -sed s%yaz_echo_source=yes%yaz_echo_source=no%g < ${srcdir}/yaz++-config.in >${srcdir}/src/yaz++-config.in AC_OUTPUT([ Makefile src/Makefile include/Makefile include/yaz++/Makefile + zlint/Makefile yaz++-config - src/yaz++-config zoom/Makefile doc/Makefile doc/yaz++.xml doc/yazprint.dsl doc/yazphp.dsl doc/yazhtml.dsl -],[chmod +x yaz++-config src/yaz++-config]) + doc/tkl.xsl +],[sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz++-config >src/yaz++-config && chmod +x yaz++-config src/yaz++-config])