X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=configure.in;h=1bb8d3a28ffe192fabc66196ce2ea67ab29cf3f2;hp=23b9844f6054acc87487a05425bca7401e9fde01;hb=191ceffa0af0cc1048ef11a1bf92fece3210c879;hpb=cb007c6145b0dbb3fcbe9826f081650becf9a05c diff --git a/configure.in b/configure.in index 23b9844..1bb8d3a 100644 --- a/configure.in +++ b/configure.in @@ -1,9 +1,8 @@ dnl Zebra, Index Data Aps, 1995-2004 -dnl $Id: configure.in,v 1.94 2004-08-24 10:37:18 adam Exp $ +dnl $Id: configure.in,v 1.100 2004-09-27 08:29:38 adam Exp $ dnl -AC_INIT(include/zebraver.h) +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) @@ -19,56 +18,8 @@ dnl dnl ------ Checking programs AC_PROG_CC AC_PROG_CPP -AC_PROG_INSTALL -AC_PROG_RANLIB -dnl -dnl ----- DOCBOOK DTD -AC_SUBST(DTD_DIR) -AC_ARG_WITH(dtd, [ --with-dtd[=DIR] Use docbookx.dtd in DIR], -[ - if test -f "$withval/docbookx.dtd"; then - DTD_DIR=$withval - fi -],[ - AC_MSG_CHECKING(for docbookx.dtd) - for d in /usr/share/sgml/docbook/dtd/xml/4.1.2 \ - /usr/share/sgml/docbook/xml-dtd-4.1.2* \ - /usr/share/sgml/docbook/xml-dtd-4.1 \ - /usr/share/sgml/docbook/dtd/xml/4.0 \ - /usr/lib/sgml/dtd/docbook-xml - do - if test -f $d/docbookx.dtd; then - AC_MSG_RESULT($d) - DTD_DIR=$d - break - fi - done - if test -z "$DTD_DIR"; then - AC_MSG_RESULT(Not found) - fi -]) -AC_SUBST(DSSSL_DIR) -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 - fi -],[ - AC_MSG_CHECKING(for docbook.dsl) - for d in /usr/share/sgml/docbook/stylesheet/dsssl/modular \ - /usr/share/sgml/docbook/dsssl-stylesheets-1.* \ - /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh - do - if test -f $d/html/docbook.dsl; then - AC_MSG_RESULT($d) - DSSSL_DIR=$d - break - fi - done - if test -z "$DSSSL_DIR"; then - AC_MSG_RESULT(Not found) - fi -]) +AM_DISABLE_SHARED +AM_PROG_LIBTOOL dnl AC_ARG_ENABLE(threads, [ --disable-threads disable threads],[enable_threads=$enableval],[enable_threads=yes]) if test "$enable_threads" = "yes"; then @@ -77,6 +28,7 @@ else yazflag="" fi YAZ_INIT($yazflag) +YAZ_DOC 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 @@ -146,25 +98,19 @@ if test "$ac_cv_lib_readline_readline" = "yes"; then #include #include ],[ - static void f() - { rl_attempted_completion_over = 0; - } ],AC_DEFINE(HAVE_READLINE_COMPLETION_OVER)) AC_TRY_LINK([ #include #include ],[ - static void f() - { rl_completion_matches (0, 0); - } ],AC_DEFINE(HAVE_READLINE_RL_COMPLETION_MATCHES)) LIBS=$xLIBS fi dnl dnl ------ iconv -AC_ARG_WITH(iconv, [ --with-iconv[=DIR] iconv library in DIR]) +AC_ARG_WITH(iconv, [ --with-iconv[=DIR] iconv library in DIR]) if test "$with_iconv" != "no"; then AC_MSG_CHECKING(for iconv) oldLIBS="$LIBS" @@ -176,7 +122,7 @@ if test "$with_iconv" != "no"; then AC_TRY_LINK([ #include ],[ - static void f() {iconv_t t = iconv_open("", ""); } + iconv_t t = iconv_open("", ""); ],[ AC_DEFINE(HAVE_ICONV_H) AC_MSG_RESULT(yes) @@ -185,7 +131,7 @@ if test "$with_iconv" != "no"; then AC_TRY_LINK([ #include ],[ - static void f() {iconv_t t = iconv_open("", ""); } + iconv_t t = iconv_open("", ""); ],[ AC_DEFINE(HAVE_ICONV_H) AC_MSG_RESULT(yes) @@ -213,7 +159,7 @@ AC_CHECK_LIB(m,sqrt) dnl dnl ------ EXPAT expat=yes -AC_ARG_WITH(expat, [ --with-expat[=DIR] EXPAT library in DIR],[expat=$withval]) +AC_ARG_WITH(expat, [ --with-expat[=DIR] EXPAT library in DIR],[expat=$withval]) if test "$expat" != "no"; then xLIBS="$LIBS"; xCFLAGS="$CFLAGS"; @@ -238,7 +184,7 @@ perl=no PERL_XS_INIT="NULL" PERL_XS_INIT_INCLUDE='' PERL_BINARY="" -AC_ARG_WITH(perl, [ --with-perl[=FILE] perl binary location],[perl=$withval]) +AC_ARG_WITH(perl, [ --with-perl[=FILE] perl binary location],[perl=$withval]) if test "$perl" != "no"; then AC_MSG_CHECKING(for perl binary) if test "$perl" = "yes"; then @@ -298,10 +244,7 @@ if test "$perl" != "no"; then AC_TRY_LINK([ #include ],[ - static void f() - { - ; - } + ; ],AM_CONDITIONAL(perl,true) AC_DEFINE(HAVE_PERL,1) AC_MSG_RESULT(found) @@ -362,6 +305,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 @@ -377,7 +324,7 @@ AC_OUTPUT([ recctrl/Makefile recctrl/perlread.h index/Makefile - include/Makefile + include/Makefile include/idzebra/Makefile tab/Makefile doc/Makefile doc/zebra.xml @@ -387,13 +334,14 @@ AC_OUTPUT([ doc/tkl.xsl test/Makefile test/gils/Makefile test/usmarc/Makefile test/api/Makefile test/rusmarc/Makefile test/cddb/Makefile test/malxml/Makefile - test/config/Makefile + test/config/Makefile test/sort2/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