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
Minor updates to configure script.
[yaz-moved-to-github.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
187db9f
..
d60d30e
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.30 2000-07-06 10:38:47 adam Exp $
+dnl $Id: configure.in,v 1.35 2000-10-03 13:17:53 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
@@
-37,6
+37,9
@@
if test -r ${yaz_include}/proto.h && cmp -s ${yaz_include}/$HFILE ${yaz_include}
else
AC_MSG_RESULT(yes)
cp -f ${yaz_include}/$HFILE ${yaz_include}/proto.h
else
AC_MSG_RESULT(yes)
cp -f ${yaz_include}/$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
@@
-66,8
+69,8
@@
dnl ------ snprintf
AC_CHECK_FUNCS(vsnprintf gettimeofday)
dnl
dnl ------ tcpd
AC_CHECK_FUNCS(vsnprintf gettimeofday)
dnl
dnl ------ tcpd
-AC_ARG_ENABLE(tcpd,[ --enable-tcpd[=PREFIX] enable TCP wrapper for server if available])
-if test "$enable_tcpd" != "no"; then
+AC_ARG_ENABLE(tcpd,[ --enable-tcpd[=PREFIX] enable TCP wrapper for server if available])
+if test "$enable_tcpd" != ""; then
oldLibs=$LIBS
oldCPPFLAGS=$CPPFLAGS
if test "$enable_tcpd" != "yes"; then
oldLibs=$LIBS
oldCPPFLAGS=$CPPFLAGS
if test "$enable_tcpd" != "yes"; then
@@
-100,7
+103,7
@@
if test "$ac_cv_header_stdc" = "no"; then
fi
dnl
dnl ------ Threads
fi
dnl
dnl ------ Threads
-AC_ARG_ENABLE(threads, [ --disable-threads disable threads],[enable_threads=$enableval],[enable_threads=yes])
+AC_ARG_ENABLE(threads, [ --enable-threads enable POSIX threads],[enable_threads=$enableval],[enable_threads=no])
if test "$enable_threads" = "yes"; then
AC_CHECK_LIB(pthread,main)
AC_MSG_CHECKING(for working POSIX Threads)
if test "$enable_threads" = "yes"; then
AC_CHECK_LIB(pthread,main)
AC_MSG_CHECKING(for working POSIX Threads)
@@
-118,6
+121,9
@@
if test "$enable_threads" = "yes"; then
AC_MSG_RESULT(no)
fi
fi
AC_MSG_RESULT(no)
fi
fi
+dnl ------ Using this for "in-source" yaz-config
+AC_SUBST(YAZ_SRC_ROOT)
+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)
@@
-143,4
+149,5
@@
lib/Makefile
client/Makefile
ztest/Makefile
doc/Makefile
client/Makefile
ztest/Makefile
doc/Makefile
-lib/yaz-config],[chmod +x lib/yaz-config])
+yaz-config
+lib/yaz-config],[chmod +x lib/yaz-config yaz-config])