projects
/
yazpp-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update to new --with-yaz-config
[yazpp-moved-to-github.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
9d3674e
..
2620e8a
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-1,5
+1,5
@@
AC_INIT(configure.in)
AC_INIT(configure.in)
-AM_INIT_AUTOMAKE("yaz++", 0.1)
+AM_INIT_AUTOMAKE("yaz++",0.8)
AC_PROG_CC
AC_PROG_CPP
AC_PROG_CC
AC_PROG_CPP
@@
-8,20
+8,27
@@
AC_HEADER_STDC
AM_DISABLE_SHARED
AM_PROG_LIBTOOL
AM_DISABLE_SHARED
AM_PROG_LIBTOOL
-YAZ_INIT
+YAZ_INIT(threads,2.0.12)
+YAZ_DOC
+
+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")
-YAZPP_SRC_ROOT=`pwd`
AC_SUBST(YAZPP_SRC_ROOT)
AC_SUBST(YAZPP_SRC_ROOT)
+AC_SUBST(YAZPP_BUILD_ROOT)
+YAZPP_SRC_ROOT=`cd ${srcdir}; pwd`
+YAZPP_BUILD_ROOT=`pwd`
-if test -f src/yaz++-config.in; then
- rm src/yaz++-config.in
-fi
-sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz++-config.in >src/yaz++-config.in
AC_OUTPUT([
Makefile
src/Makefile
include/Makefile
include/yaz++/Makefile
AC_OUTPUT([
Makefile
src/Makefile
include/Makefile
include/yaz++/Makefile
+ zlint/Makefile
yaz++-config
yaz++-config
- src/yaz++-config
-],[chmod +x yaz++-config src/yaz++-config])
+ zoom/Makefile
+ doc/Makefile
+ doc/yaz++.xml
+ doc/yazprint.dsl doc/yazphp.dsl doc/yazhtml.dsl
+ 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])