X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.in;h=16c7a515f668e93379f626745ca7b50ce10acb43;hp=187db9f56ee6fc81af3ccfc76ea92d7de79a7d9e;hb=33a6eab614ca84eef817f675843e6de820d13708;hpb=bc5e5d4ed7440baeac26adbbeedc5719d9b18dac

diff --git a/configure.in b/configure.in
index 187db9f..16c7a51 100644
--- 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 $Id: configure.in,v 1.30 2000-07-06 10:38:47 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
@@ -22,21 +22,24 @@ if test "$enable_comp" = "yes"; then
 	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"
-	HFILE=prt-proto.h
+	HFILE=${srcdir}/asn/prt-proto.h
 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)
-	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
@@ -66,8 +69,8 @@ dnl ------ snprintf
 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
@@ -100,7 +103,7 @@ if test "$ac_cv_header_stdc" = "no"; then
 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)
@@ -118,9 +121,16 @@ if test "$enable_threads" = "yes"; then
 		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)
+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
@@ -143,4 +153,6 @@ lib/Makefile
 client/Makefile
 ztest/Makefile
 doc/Makefile
-lib/yaz-config],[chmod +x lib/yaz-config])
+yaz-config
+lib/yaz-config
+],[chmod +x yaz-config lib/yaz-config])