projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added chapter on query model, PQF, bib1-attribute sets. Much documentation still...
[idzebra-moved-to-github.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
9d3f17e
..
1db5c8a
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,5
+1,5
@@
dnl Zebra, Index Data ApS, 1995-2006
dnl Zebra, Index Data ApS, 1995-2006
-dnl $Id: configure.ac,v 1.5 2006-05-10 14:13:45 adam Exp $
+dnl $Id: configure.ac,v 1.14 2006-06-12 23:46:21 adam Exp $
dnl
AC_PREREQ(2.59)
AC_INIT([idzebra],[1.4.0],[adam@indexdata.dk])
dnl
AC_PREREQ(2.59)
AC_INIT([idzebra],[1.4.0],[adam@indexdata.dk])
@@
-34,7
+34,7
@@
else
fi
dnl
dnl ------ YAZ
fi
dnl
dnl ------ YAZ
-YAZ_INIT($yazflag,2.1.9)
+YAZ_INIT($yazflag,2.1.20)
YAZ_DOC
dnl ----- libXSLT
AC_SUBST(XSLT_LIBS)
YAZ_DOC
dnl ----- libXSLT
AC_SUBST(XSLT_LIBS)
@@
-287,7
+287,12
@@
AC_DEFUN([ZEBRA_MODULE],[
fi
fi
m=`echo $1|tr .- __`
fi
fi
m=`echo $1|tr .- __`
- if test "$myen" = "shared"; then
+ if test "$myen" = "no"; then
+ AC_MSG_RESULT([disabled])
+ elif test "$2" = "disabled"; then
+ AC_MSG_RESULT([disabled])
+ AC_MSG_ERROR([Cannot enable mod-$1 because of missing libs (XML, etc)])
+ elif test "$myen" = "shared"; then
AC_MSG_RESULT([shared])
SHARED_MODULE_LA="${SHARED_MODULE_LA} mod-$1.la"
elif test "$myen" = "static" -o "$myen" = "yes"; then
AC_MSG_RESULT([shared])
SHARED_MODULE_LA="${SHARED_MODULE_LA} mod-$1.la"
elif test "$myen" = "static" -o "$myen" = "yes"; then
@@
-296,8
+301,6
@@
AC_DEFUN([ZEBRA_MODULE],[
STATIC_MODULE_LADD="${STATIC_MODULE_LADD} \$(mod_${m}_la_LADD)"
modcpp=`echo $1|tr abcdefghijklmnopqrstuvwxyz- ABCDEFGHIJKLMNOPQRSTUVWXYZ_`
AC_DEFINE_UNQUOTED([IDZEBRA_STATIC_$modcpp])
STATIC_MODULE_LADD="${STATIC_MODULE_LADD} \$(mod_${m}_la_LADD)"
modcpp=`echo $1|tr abcdefghijklmnopqrstuvwxyz- ABCDEFGHIJKLMNOPQRSTUVWXYZ_`
AC_DEFINE_UNQUOTED([IDZEBRA_STATIC_$modcpp])
- elif test "$myen" = "no"; then
- AC_MSG_RESULT([disabled])
else
AC_MSG_RESULT([$myen])
AC_MSG_ERROR([invalid --enable-mod-$1 value. Use on,off,static or shared])
else
AC_MSG_RESULT([$myen])
AC_MSG_ERROR([invalid --enable-mod-$1 value. Use on,off,static or shared])
@@
-308,22
+311,19
@@
ZEBRA_MODULE(text,static, [ --enable-mod-text Text filter])
ZEBRA_MODULE(grs-sgml,static,[ --enable-mod-grs-sgml Simple SGML/XML filter])
ZEBRA_MODULE(grs-regx,shared,[ --enable-mod-grs-regx REGX/TCL filter])
ZEBRA_MODULE(grs-marc,shared,[ --enable-mod-grs-marc MARC filter])
ZEBRA_MODULE(grs-sgml,static,[ --enable-mod-grs-sgml Simple SGML/XML filter])
ZEBRA_MODULE(grs-regx,shared,[ --enable-mod-grs-regx REGX/TCL filter])
ZEBRA_MODULE(grs-marc,shared,[ --enable-mod-grs-marc MARC filter])
-ZEBRA_MODULE(grs-csv,shared, [ --enable-mod-grs-csv CSV filter])
-ZEBRA_MODULE(grs-danbib,shared,[ --enable-mod-grs-danbib DanBib filter (DBC)])
ZEBRA_MODULE(safari,shared, [ --enable-mod-safari Safari filter (DBC)])
if test "$ac_cv_header_expat_h" = "yes"; then
def="shared"
else
ZEBRA_MODULE(safari,shared, [ --enable-mod-safari Safari filter (DBC)])
if test "$ac_cv_header_expat_h" = "yes"; then
def="shared"
else
- def="no"
+ def="disabled"
fi
ZEBRA_MODULE(grs-xml,[$def], [ --enable-mod-grs-xml XML filter (Expat based)])
if test "$XSLT_VER"; then
def="shared"
else
fi
ZEBRA_MODULE(grs-xml,[$def], [ --enable-mod-grs-xml XML filter (Expat based)])
if test "$XSLT_VER"; then
def="shared"
else
- def="no"
+ def="disabled"
fi
fi
-ZEBRA_MODULE(xslt,[$def], [ --enable-mod-xslt XSLT filter])
-ZEBRA_MODULE(alvis,[$def], [ --enable-mod-alvis ALVIS filter])
+ZEBRA_MODULE(alvis,[$def], [ --enable-mod-alvis ALVIS filter (Requires libxslt)])
dnl ------ ANSI C Header files
AC_STDC_HEADERS
if test "$ac_cv_header_stdc" = "no"; then
dnl ------ ANSI C Header files
AC_STDC_HEADERS
if test "$ac_cv_header_stdc" = "no"; then
@@
-350,12
+350,9
@@
AC_OUTPUT([
include/Makefile include/idzebra/Makefile
tab/Makefile
doc/Makefile
include/Makefile include/idzebra/Makefile
tab/Makefile
doc/Makefile
- doc/zebra.xml
+ doc/local.ent
doc/common/Makefile
doc/common/Makefile
- doc/common/html.dsl
- doc/common/html.xsl
doc/common/print.dsl
doc/common/print.dsl
- doc/common/tkl.xsl
test/Makefile test/gils/Makefile test/usmarc/Makefile test/api/Makefile
test/xslt/Makefile
test/xpath/Makefile
test/Makefile test/gils/Makefile test/usmarc/Makefile test/api/Makefile
test/xslt/Makefile
test/xpath/Makefile
@@
-368,7
+365,8
@@
AC_OUTPUT([
test/espec/Makefile
test/filters/Makefile
examples/Makefile examples/gils/Makefile examples/zthes/Makefile
test/espec/Makefile
test/filters/Makefile
examples/Makefile examples/gils/Makefile examples/zthes/Makefile
- examples/marc21/Makefile examples/alvis-oai/Makefile
+ examples/marc21/Makefile examples/marcxml/Makefile
+ examples/alvis-oai/Makefile
idzebra.spec
idzebra-config
Doxyfile
idzebra.spec
idzebra-config
Doxyfile
@@
-398,9
+396,11
@@
fi
echo \
"------------------------------------------------------------------------
echo \
"------------------------------------------------------------------------
-Configuration:
+ ZEBRA Package: ${PACKAGE}
+ ZEBRA Version: ${VERSION}
Source code location: ${srcdir}
Source code location: ${srcdir}
+ C Preprocessor: ${CPP}
C Preprocessor flags: ${CPPFLAGS}
C Compiler: ${CC}
C Compiler flags: ${CFLAGS}
C Preprocessor flags: ${CPPFLAGS}
C Compiler: ${CC}
C Compiler flags: ${CFLAGS}
@@
-409,5
+409,12
@@
Configuration:
Host System Type: ${host}
Install path: ${prefix}
Automake: ${AUTOMAKE}
Host System Type: ${host}
Install path: ${prefix}
Automake: ${AUTOMAKE}
+ Archiver: ${AR}
+ Ranlib: ${RANLIB}
+ YAZ Version: ${YAZVERSION}
+ YAZ Include: ${YAZINC}
+ YAZ La Lib: ${YAZLALIB}
+ YAZ Lib: ${YAZLIB}
+ Bugreport: ${PACKAGE_BUGREPORT}
------------------------------------------------------------------------"
------------------------------------------------------------------------"