From bc0541635987ad8f35af9df6aacd5534d519ccb6 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 2 May 2000 19:32:15 +0000 Subject: [PATCH] Defined READLINE_LIBS for the yaz-client. --- Makefile.in | 1 + asn/Makefile.in | 1 + ccl/Makefile.in | 1 + client/Makefile.am | 4 +- client/Makefile.in | 3 +- comstack/Makefile.in | 1 + configure | 167 ++++++++++++++++++++++++----------------------- configure.in | 10 +-- doc/Makefile.in | 1 + ill/Makefile.in | 1 + include/Makefile.in | 1 + include/yaz/Makefile.in | 1 + lib/Makefile.am | 6 +- lib/Makefile.in | 5 +- odr/Makefile.in | 1 + retrieval/Makefile.in | 1 + server/Makefile.in | 1 + tab/Makefile.in | 1 + util/Makefile.in | 1 + z39.50/Makefile.in | 1 + ztest/Makefile.in | 1 + zutil/Makefile.in | 1 + 22 files changed, 117 insertions(+), 94 deletions(-) diff --git a/Makefile.in b/Makefile.in index 5e1f5fb..e698e8c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -74,6 +74,7 @@ NM = @NM@ OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ diff --git a/asn/Makefile.in b/asn/Makefile.in index c636499..ddf953b 100644 --- a/asn/Makefile.in +++ b/asn/Makefile.in @@ -74,6 +74,7 @@ NM = @NM@ OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ diff --git a/ccl/Makefile.in b/ccl/Makefile.in index 4996642..f162eb8 100644 --- a/ccl/Makefile.in +++ b/ccl/Makefile.in @@ -74,6 +74,7 @@ NM = @NM@ OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ diff --git a/client/Makefile.am b/client/Makefile.am index d3a9be2..9c0fe71 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -1,11 +1,11 @@ ## Copyright (C) 1995-2000, Index Data ## All rights reserved. -## $Id: Makefile.am,v 1.6 2000-04-05 07:39:54 adam Exp $ +## $Id: Makefile.am,v 1.7 2000-05-02 19:32:16 adam Exp $ bin_PROGRAMS=yaz-client yaz_client_SOURCES=client.c admin.c admin.h -yaz_client_LDADD = ../lib/libyaz.la +yaz_client_LDADD = ../lib/libyaz.la $(READLINE_LIBS) INCLUDES=-I$(srcdir)/../include -DCCLRPN=1 diff --git a/client/Makefile.in b/client/Makefile.in index 4bd78b3..5ec0342 100644 --- a/client/Makefile.in +++ b/client/Makefile.in @@ -74,6 +74,7 @@ NM = @NM@ OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ @@ -81,7 +82,7 @@ bin_PROGRAMS = yaz-client yaz_client_SOURCES = client.c admin.c admin.h -yaz_client_LDADD = ../lib/libyaz.la +yaz_client_LDADD = ../lib/libyaz.la $(READLINE_LIBS) INCLUDES = -I$(srcdir)/../include -DCCLRPN=1 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/comstack/Makefile.in b/comstack/Makefile.in index acac41b..ef2f116 100644 --- a/comstack/Makefile.in +++ b/comstack/Makefile.in @@ -74,6 +74,7 @@ NM = @NM@ OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ diff --git a/configure b/configure index 1e941e0..7d53d14 100755 --- a/configure +++ b/configure @@ -789,10 +789,11 @@ else fi + # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:796: checking for $ac_word" >&5 +echo "configure:797: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -822,7 +823,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:826: checking for $ac_word" >&5 +echo "configure:827: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -873,7 +874,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:877: checking for $ac_word" >&5 +echo "configure:878: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -905,7 +906,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:909: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:910: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -916,12 +917,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 920 "configure" +#line 921 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -947,12 +948,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:951: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:952: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:956: checking whether we are using GNU C" >&5 +echo "configure:957: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -961,7 +962,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:965: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -980,7 +981,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:984: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:985: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1012,7 +1013,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1016: checking how to run the C preprocessor" >&5 +echo "configure:1017: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1027,13 +1028,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1037: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1038: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1044,13 +1045,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1054: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1055: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1061,13 +1062,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1071: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1072: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1103,7 +1104,7 @@ echo "$ac_t""$CPP" 1>&6 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1107: checking for a BSD compatible install" >&5 +echo "configure:1108: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1231,7 +1232,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1235: checking host system type" >&5 +echo "configure:1236: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1252,7 +1253,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1256: checking build system type" >&5 +echo "configure:1257: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1272,7 +1273,7 @@ echo "$ac_t""$build" 1>&6 # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1276: checking for $ac_word" >&5 +echo "configure:1277: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1311,7 +1312,7 @@ ac_prog=ld if test "$ac_cv_prog_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1315: checking for ld used by GCC" >&5 +echo "configure:1316: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -1335,10 +1336,10 @@ echo "configure:1315: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1339: checking for GNU ld" >&5 +echo "configure:1340: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1342: checking for non-GNU ld" >&5 +echo "configure:1343: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1374,7 +1375,7 @@ fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1378: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1379: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1390,7 +1391,7 @@ echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1394: checking for BSD-compatible nm" >&5 +echo "configure:1395: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1427,7 +1428,7 @@ echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1431: checking whether ln -s works" >&5 +echo "configure:1432: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1476,8 +1477,8 @@ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent" case "$host" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 1480 "configure"' > conftest.$ac_ext - if { (eval echo configure:1481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 1481 "configure"' > conftest.$ac_ext + if { (eval echo configure:1482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) LD="${LD-ld} -32" @@ -1498,19 +1499,19 @@ case "$host" in SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:1502: checking whether the C compiler needs -belf" >&5 +echo "configure:1503: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -1636,7 +1637,7 @@ else HFILE=prt-proto.h fi echo $ac_n "checking whether proto.h needs to be generated""... $ac_c" 1>&6 -echo "configure:1640: checking whether proto.h needs to be generated" >&5 +echo "configure:1641: checking whether proto.h needs to be generated" >&5 yaz_include=${srcdir}/include/yaz if test -r ${yaz_include}/proto.h && cmp -s ${yaz_include}/$HFILE ${yaz_include}/proto.h; then echo "$ac_t""no" 1>&6 @@ -1646,12 +1647,12 @@ else fi checkBoth=0 echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:1650: checking for connect" >&5 +echo "configure:1651: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -1695,7 +1696,7 @@ fi if test "$ac_cv_func_connect" = "no"; then echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:1699: checking for main in -lsocket" >&5 +echo "configure:1700: checking for main in -lsocket" >&5 ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1703,14 +1704,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1736,12 +1737,12 @@ if test "$checkBoth" = "1"; then oldLibs=$LIBS LIBS="$LIBS -lsocket -lnsl" echo $ac_n "checking for accept""... $ac_c" 1>&6 -echo "configure:1740: checking for accept" >&5 +echo "configure:1741: checking for accept" >&5 if eval "test \"`echo '$''{'ac_cv_func_accept'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_accept=yes" else @@ -1786,12 +1787,12 @@ fi fi echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:1790: checking for gethostbyname" >&5 +echo "configure:1791: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -1832,7 +1833,7 @@ if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:1836: checking for main in -lnsl" >&5 +echo "configure:1837: checking for main in -lnsl" >&5 ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1840,14 +1841,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1869,8 +1870,9 @@ fi fi +READLINE_LIBS="" echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 -echo "configure:1874: checking for readline in -lreadline" >&5 +echo "configure:1876: checking for readline in -lreadline" >&5 ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1878,7 +1880,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lreadline $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1904,14 +1906,14 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIBS="$LIBS -lreadline" + READLINE_LIBS="$READLINE_LIBS -lreadline" else echo "$ac_t""no" 1>&6 fi if test "$ac_cv_lib_readline_readline" = "no"; then echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 -echo "configure:1915: checking for readline in -lreadline" >&5 +echo "configure:1917: checking for readline in -lreadline" >&5 ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1919,7 +1921,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lreadline $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1945,14 +1947,14 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIBS="$LIBS -lreadline -ltermcap" + READLINE_LIBS="$READLINE_LIBS -lreadline -ltermcap" else echo "$ac_t""no" 1>&6 fi fi echo $ac_n "checking for add_history in -lhistory""... $ac_c" 1>&6 -echo "configure:1956: checking for add_history in -lhistory" >&5 +echo "configure:1958: checking for add_history in -lhistory" >&5 ac_lib_var=`echo history'_'add_history | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1960,7 +1962,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lhistory $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1986,7 +1988,7 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIBS="$LIBS -lhistory" + READLINE_LIBS="$READLINE_LIBS -lhistory" else echo "$ac_t""no" 1>&6 fi @@ -1996,17 +1998,17 @@ if test "$ac_cv_lib_readline_readline" = "yes"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2000: checking for $ac_hdr" >&5 +echo "configure:2002: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2010: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2012: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2036,12 +2038,12 @@ fi for ac_func in vsnprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2040: checking for $ac_func" >&5 +echo "configure:2042: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2096,11 +2098,11 @@ fi if test "$enable_tcpd" = "yes"; then echo $ac_n "checking for working tcpd.h""... $ac_c" 1>&6 -echo "configure:2100: checking for working tcpd.h" >&5 +echo "configure:2102: checking for working tcpd.h" >&5 oldLibs=$LIBS LIBS="$LIBS -lwrap -lnsl" cat > conftest.$ac_ext < #include @@ -2111,7 +2113,7 @@ struct request_info request_info; int i; i = hosts_access(&request_info); ; return 0; } EOF -if { (eval echo configure:2115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* tcpd_ok=1 else @@ -2133,12 +2135,12 @@ EOF fi fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2137: checking for ANSI C header files" >&5 +echo "configure:2139: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2146,7 +2148,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2150: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2152: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2163,7 +2165,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -2181,7 +2183,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -2202,7 +2204,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2213,7 +2215,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:2217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2249,7 +2251,7 @@ fi if test "$enable_threads" = "yes"; then echo $ac_n "checking for main in -lpthread""... $ac_c" 1>&6 -echo "configure:2253: checking for main in -lpthread" >&5 +echo "configure:2255: checking for main in -lpthread" >&5 ac_lib_var=`echo pthread'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2257,14 +2259,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2292,9 +2294,9 @@ else fi echo $ac_n "checking for working POSIX Threads""... $ac_c" 1>&6 -echo "configure:2296: checking for working POSIX Threads" >&5 +echo "configure:2298: checking for working POSIX Threads" >&5 cat > conftest.$ac_ext < int func(void *p) { return 0; } @@ -2305,7 +2307,7 @@ int main() { int r = pthread_create (&pthread_id, 0, func, 0); ; return 0; } EOF -if { (eval echo configure:2309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* thread_ok=yes else @@ -2487,6 +2489,7 @@ s%@AUTOMAKE@%$AUTOMAKE%g s%@AUTOHEADER@%$AUTOHEADER%g s%@MAKEINFO@%$MAKEINFO%g s%@SET_MAKE@%$SET_MAKE%g +s%@READLINE_LIBS@%$READLINE_LIBS%g s%@CC@%$CC%g s%@CPP@%$CPP%g s%@host@%$host%g diff --git a/configure.in b/configure.in index 81915a9..3d5da61 100644 --- a/configure.in +++ b/configure.in @@ -1,10 +1,11 @@ dnl YAZ Toolkit dnl (c) Index Data 1994-2000 dnl See the file LICENSE for details. -dnl $Id: configure.in,v 1.26 2000-04-11 21:22:28 adam Exp $ +dnl $Id: configure.in,v 1.27 2000-05-02 19:32:15 adam Exp $ AC_INIT(include/yaz/yaz-version.h) AM_INIT_AUTOMAKE(yaz, 1.7) dnl +AC_SUBST(READLINE_LIBS) dnl ------ Checking programs AC_PROG_CC AC_PROG_CPP @@ -53,11 +54,12 @@ fi AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"])) dnl dnl ------ GNU Readline -AC_CHECK_LIB(readline, readline, [LIBS="$LIBS -lreadline"]) +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, [LIBS="$LIBS -lreadline -ltermcap"]) + AC_CHECK_LIB(readline, readline, [READLINE_LIBS="$READLINE_LIBS -lreadline -ltermcap"]) fi -AC_CHECK_LIB(history, add_history, [LIBS="$LIBS -lhistory"]) +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) fi diff --git a/doc/Makefile.in b/doc/Makefile.in index c65d6c9..1d1aeaa 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -74,6 +74,7 @@ NM = @NM@ OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ diff --git a/ill/Makefile.in b/ill/Makefile.in index 0234314..c866d9c 100644 --- a/ill/Makefile.in +++ b/ill/Makefile.in @@ -74,6 +74,7 @@ NM = @NM@ OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ diff --git a/include/Makefile.in b/include/Makefile.in index 25344fa..73ce914 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -74,6 +74,7 @@ NM = @NM@ OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ diff --git a/include/yaz/Makefile.in b/include/yaz/Makefile.in index f805bc4..85b811e 100644 --- a/include/yaz/Makefile.in +++ b/include/yaz/Makefile.in @@ -74,6 +74,7 @@ NM = @NM@ OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ diff --git a/lib/Makefile.am b/lib/Makefile.am index d44ac1d..b653261 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.4 2000-04-06 12:32:56 adam Exp $ +## $Id: Makefile.am,v 1.5 2000-05-02 19:32:16 adam Exp $ lib_LTLIBRARIES = libyaz.la @@ -13,10 +13,10 @@ libyaz_la_SOURCES= LDFLAGS=-version-info 0:0:0 -libyaz_la_LIBADD=../odr/libodr.la ../@ASNMODULE@/libasn.la \ +libyaz_la_LIBADD=../odr/libodr.la ../$(ASNMODULE)/libasn.la \ ../comstack/libcomstack.la ../server/libserver.la \ ../zutil/libzutil.la ../util/libutil.la ../ccl/libccl.la \ - ../retrieval/libret.la @ILLLIB@ + ../retrieval/libret.la $(ILLLIB) # Public libraries and header files LIBDIR=$(exec_prefix)/lib diff --git a/lib/Makefile.in b/lib/Makefile.in index 1ba542d..521408e 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -74,6 +74,7 @@ NM = @NM@ OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ @@ -90,7 +91,7 @@ libyaz_la_SOURCES = LDFLAGS = -version-info 0:0:0 -libyaz_la_LIBADD = ../odr/libodr.la ../@ASNMODULE@/libasn.la ../comstack/libcomstack.la ../server/libserver.la ../zutil/libzutil.la ../util/libutil.la ../ccl/libccl.la ../retrieval/libret.la @ILLLIB@ +libyaz_la_LIBADD = ../odr/libodr.la ../$(ASNMODULE)/libasn.la ../comstack/libcomstack.la ../server/libserver.la ../zutil/libzutil.la ../util/libutil.la ../ccl/libccl.la ../retrieval/libret.la $(ILLLIB) # Public libraries and header files @@ -105,7 +106,7 @@ DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ libyaz_la_LDFLAGS = -libyaz_la_DEPENDENCIES = ../odr/libodr.la ../@ASNMODULE@/libasn.la \ +libyaz_la_DEPENDENCIES = ../odr/libodr.la ../$(ASNMODULE)/libasn.la \ ../comstack/libcomstack.la ../server/libserver.la ../zutil/libzutil.la \ ../util/libutil.la ../ccl/libccl.la ../retrieval/libret.la libyaz_la_OBJECTS = diff --git a/odr/Makefile.in b/odr/Makefile.in index 0c80ac4..e02b170 100644 --- a/odr/Makefile.in +++ b/odr/Makefile.in @@ -74,6 +74,7 @@ NM = @NM@ OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ diff --git a/retrieval/Makefile.in b/retrieval/Makefile.in index d37447d..9e21f57 100644 --- a/retrieval/Makefile.in +++ b/retrieval/Makefile.in @@ -74,6 +74,7 @@ NM = @NM@ OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ diff --git a/server/Makefile.in b/server/Makefile.in index 7038dd5..30f4359 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -74,6 +74,7 @@ NM = @NM@ OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ diff --git a/tab/Makefile.in b/tab/Makefile.in index ce0f32d..c235e42 100644 --- a/tab/Makefile.in +++ b/tab/Makefile.in @@ -74,6 +74,7 @@ NM = @NM@ OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ diff --git a/util/Makefile.in b/util/Makefile.in index 8678e95..822f07d 100644 --- a/util/Makefile.in +++ b/util/Makefile.in @@ -74,6 +74,7 @@ NM = @NM@ OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ diff --git a/z39.50/Makefile.in b/z39.50/Makefile.in index f48f1ec..96d9d1c 100644 --- a/z39.50/Makefile.in +++ b/z39.50/Makefile.in @@ -74,6 +74,7 @@ NM = @NM@ OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ diff --git a/ztest/Makefile.in b/ztest/Makefile.in index f18e30d..391b339 100644 --- a/ztest/Makefile.in +++ b/ztest/Makefile.in @@ -74,6 +74,7 @@ NM = @NM@ OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ diff --git a/zutil/Makefile.in b/zutil/Makefile.in index 4d81e72..fdaabf5 100644 --- a/zutil/Makefile.in +++ b/zutil/Makefile.in @@ -74,6 +74,7 @@ NM = @NM@ OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +READLINE_LIBS = @READLINE_LIBS@ SUBDIRS_VAR = @SUBDIRS_VAR@ VERSION = @VERSION@ -- 1.7.10.4