X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=configure.in;h=cb53580283168b4cd7aa5b4ef43b57e42fac7af8;hb=e2a45cb579ee5b68950fedd2f9b8cb61591a8c28;hp=706e1879f696b13c5882a902c22080b6a91bda60;hpb=8e4eabe621f8b8195faa6625a38a2e1ae7b68aa1;p=yaz-moved-to-github.git

diff --git a/configure.in b/configure.in
index 706e187..cb53580 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
-dnl YAZ Toolkit, Index Data 1994-2000
+dnl YAZ Toolkit, Index Data 1994-2001
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.38 2000-11-23 10:58:32 adam Exp $
+dnl $Id: configure.in,v 1.42 2001-03-21 12:43:36 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
 AM_INIT_AUTOMAKE(yaz, 1.7)
 dnl
@@ -66,11 +66,12 @@ if test "$openssl" = "yes"; then
 	fi
 fi
 dnl ------ GNU Readline
+READLINE_SHARED_LIBADD=""
+AC_CHECK_LIB(ncurses, tgetent, [READLINE_SHARED_LIBADD="-lncurses"],
+	AC_CHECK_LIB(termcap, tgetent, [READLINE_SHARED_LIBADD="-ltermcap"])
+)
 READLINE_LIBS=""
-AC_CHECK_LIB(readline, readline, [READLINE_LIBS="$READLINE_LIBS -lreadline"])
-if test "$ac_cv_lib_readline_readline" = "no"; then
-	AC_CHECK_LIB(readline, readline, [READLINE_LIBS="$READLINE_LIBS -lreadline -ltermcap"])
-fi
+AC_CHECK_LIB(readline, readline, [READLINE_LIBS="$READLINE_LIBS -lreadline $READLINE_SHARED_LIBADD"],,$READLINE_SHARED_LIBADD)
 AC_CHECK_LIB(history, add_history, [READLINE_LIBS="$READLINE_LIBS -lhistory"])
 if test "$ac_cv_lib_readline_readline" = "yes"; then
 	AC_CHECK_HEADERS(readline/readline.h readline/history.h)
@@ -120,10 +121,10 @@ if test "$enable_threads" = "yes"; then
 	AC_CHECK_LIB(pthread,main)
 	AC_MSG_CHECKING(for working POSIX Threads)
 	AC_TRY_LINK([#include <pthread.h>
-	int func(void *p) { return 0; }
+	void *func(void *p) { return 0; }
 	],[
 	pthread_t pthread_id;
-	int r = pthread_create (&pthread_id, 0, func, 0);],
+	pthread_create (&pthread_id, 0, func, 0);],
 		thread_ok=yes,thread_ok=no)
 	if test "$thread_ok" = "yes"; then
 		LIBTHREAD=-lpthread
@@ -139,15 +140,17 @@ fi
 AM_CONDITIONAL(ISTHR, test $HAVETHREADS = "1")
 dnl ------ Using this for "in-source" yaz-config
 AC_SUBST(YAZ_SRC_ROOT)
-YAZ_SRC_ROOT=`pwd`
+AC_SUBST(YAZ_BUILD_ROOT)
+YAZ_SRC_ROOT=`cd ${srcdir}; pwd`
+YAZ_BUILD_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
+if test -f ${srcdir}/lib/yaz-config.in; then
+	rm ${srcdir}/lib/yaz-config.in
 fi
-sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz-config.in >lib/yaz-config.in
+sed s%yaz_echo_source=yes%yaz_echo_source=no%g < ${srcdir}/yaz-config.in >${srcdir}/lib/yaz-config.in
 dnl
+SUBDIRS_VAR="util odr $ASNMODULE $ILLMODULE zutil comstack ccl tab retrieval server include lib client ztest"
+AC_SUBST(SUBDIRS_VAR)
 dnl ------ Makefiles
 dnl
 AC_OUTPUT([