projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implemented and-list and or-list for CCL module.
[yaz-moved-to-github.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
b88f400
..
16c7a51
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-1,6
+1,6
@@
dnl YAZ Toolkit, Index Data 1994-2000
dnl See the file LICENSE for details.
dnl YAZ Toolkit, Index Data 1994-2000
dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.34 2000-10-03 12:55:50 adam Exp $
+dnl $Id: configure.in,v 1.37 2000-10-11 10:40:56 adam Exp $
AC_INIT(include/yaz/yaz-version.h)
AM_INIT_AUTOMAKE(yaz, 1.7)
dnl
AC_INIT(include/yaz/yaz-version.h)
AM_INIT_AUTOMAKE(yaz, 1.7)
dnl
@@
-22,24
+22,24
@@
if test "$enable_comp" = "yes"; then
ILLMODULE="ill"
ILLLIB=../ill/libill.la
ASN_MAKEFILES="z39.50/Makefile ill/Makefile"
ILLMODULE="ill"
ILLLIB=../ill/libill.la
ASN_MAKEFILES="z39.50/Makefile ill/Makefile"
- HFILE=z-proto.h
+ HFILE=${srcdir}/include/yaz/z-proto.h
else
ILLMODULE=""
ASNMODULE=asn
ILLLIB=""
ASN_MAKEFILES="asn/Makefile"
else
ILLMODULE=""
ASNMODULE=asn
ILLLIB=""
ASN_MAKEFILES="asn/Makefile"
- HFILE=prt-proto.h
- if ! test -r include/yaz/prt-rsc.h ; then
- cp asn/*.h include/yaz
- fi
+ HFILE=${srcdir}/asn/prt-proto.h
fi
AC_MSG_CHECKING(whether proto.h needs to be generated)
yaz_include=${srcdir}/include/yaz
fi
AC_MSG_CHECKING(whether proto.h needs to be generated)
yaz_include=${srcdir}/include/yaz
-if test -r ${yaz_include}/proto.h && cmp -s ${yaz_include}/$HFILE ${yaz_include}/proto.h; then
+if test -r ${yaz_include}/proto.h && cmp -s $HFILE ${yaz_include}/proto.h; then
AC_MSG_RESULT(no)
else
AC_MSG_RESULT(yes)
AC_MSG_RESULT(no)
else
AC_MSG_RESULT(yes)
- cp -f ${yaz_include}/$HFILE ${yaz_include}/proto.h
+ cp -f $HFILE ${yaz_include}/proto.h
+ if test "$enable_comp" != "yes"; then
+ cp ${srcdir}/asn/*.h ${yaz_include}
+ fi
fi
dnl
dnl ----- Sockets
fi
dnl
dnl ----- Sockets
@@
-127,6
+127,10
@@
YAZ_SRC_ROOT=`pwd`
dnl
SUBDIRS_VAR="util odr $ASNMODULE $ILLMODULE zutil comstack ccl tab retrieval server include lib client ztest"
AC_SUBST(SUBDIRS_VAR)
dnl
SUBDIRS_VAR="util odr $ASNMODULE $ILLMODULE zutil comstack ccl tab retrieval server include lib client ztest"
AC_SUBST(SUBDIRS_VAR)
+if test -f lib/yaz-config.in; then
+ rm lib/yaz-config.in
+fi
+sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz-config.in >lib/yaz-config.in
dnl
dnl ------ Makefiles
dnl
dnl
dnl ------ Makefiles
dnl
@@
-150,4
+154,5
@@
client/Makefile
ztest/Makefile
doc/Makefile
yaz-config
ztest/Makefile
doc/Makefile
yaz-config
-lib/yaz-config],[chmod +x lib/yaz-config yaz-config])
+lib/yaz-config
+],[chmod +x yaz-config lib/yaz-config])