Provide configure patch and remove autoconf build dependency.

3 files changed, 648 insertions, 5 deletions

diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
index 551a6d8f3e2..4e0003f2f15 100644
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2001/12/02 06:56:38 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2002/01/11 15:10:56 skrll Exp $
 # FreeBSD Id: Makefile,v 1.8 1997/06/13 16:17:01 ache Exp
 #
 
@@ -11,8 +11,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://rplay.doit.org/
 COMMENT=	Network audio player
 
-BUILD_DEPENDS+=	autoconf>=2.13:../../devel/autoconf
-
 USE_BUILDLINK_ONLY=	YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
@@ -23,7 +21,6 @@ INFO_FILES=	RPLAY.info RPTP.info librplay.info rplay.info
 RCD_SCRIPTS=	rplayd
 
 pre-configure:
-	cd ${WRKSRC}; ${LOCALBASE}/bin/autoreconf --force
 	cd ${WRKSRC}/doc; for manpage in *.[0-9]; do			\
 		${SED}	-e "s|/usr/local/etc|${PKG_SYSCONFDIR}|g"	\
 			-e "s|/usr/local|${PREFIX}|g"			\
diff --git a/audio/rplay/distinfo b/audio/rplay/distinfo
index 4701f5e3ffd..6806c6ae9cd 100644
--- a/audio/rplay/distinfo
+++ b/audio/rplay/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 12:14:37 agc Exp $
+$NetBSD: distinfo,v 1.3 2002/01/11 15:10:56 skrll Exp $
 
 SHA1 (rplay-3.3.2.tar.gz) = 80b8001998a6f9837773f26285afffd609df2662
 Size (rplay-3.3.2.tar.gz) = 480015 bytes
@@ -19,3 +19,4 @@ SHA1 (patch-an) = c59d49c738596943b6e4fbef19130d3a38fe4ad2
 SHA1 (patch-ao) = 01316da024026f526dd5389c3a6c2eaf89814546
 SHA1 (patch-ap) = 46e7e7fc0fb3b7d5228bf81877ac186eda1be00f
 SHA1 (patch-aq) = 41e6f83bb5c8a1223fc9d9cd8a21fee36012965f
+SHA1 (patch-ar) = 06f01357c1378ae017e2efd0fefbaa5ac0d6b206
diff --git a/audio/rplay/patches/patch-ar b/audio/rplay/patches/patch-ar
new file mode 100644
index 00000000000..5c76906fe53
--- /dev/null
+++ b/audio/rplay/patches/patch-ar
@@ -0,0 +1,645 @@
+$NetBSD: patch-ar,v 1.1 2002/01/11 15:10:56 skrll Exp $
+
+--- configure.orig	Fri Jan 11 15:05:27 2002
++++ configure
+@@ -1546,13 +1546,53 @@
+ fi
+ done
+ 
++for ac_hdr in readline.h history.h readline/readline.h readline/history.h
++do
++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
++echo "configure:1554: 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
++#line 1559 "configure"
++#include "confdefs.h"
++#include <$ac_hdr>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:1564: \"$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*
++  eval "ac_cv_header_$ac_safe=yes"
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
++fi
++rm -f conftest*
++fi
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_hdr 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
+ echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
+-echo "configure:1551: checking for sys/wait.h that is POSIX.1 compatible" >&5
++echo "configure:1591: checking for sys/wait.h that is POSIX.1 compatible" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1556 "configure"
++#line 1596 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/wait.h>
+@@ -1568,7 +1608,7 @@
+ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1612: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_header_sys_wait_h=yes
+ else
+@@ -1590,12 +1630,12 @@
+ 
+ 
+ echo $ac_n "checking for working const""... $ac_c" 1>&6
+-echo "configure:1594: checking for working const" >&5
++echo "configure:1634: checking for working const" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1599 "configure"
++#line 1639 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -1644,7 +1684,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1648: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1688: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_const=yes
+ else
+@@ -1665,12 +1705,12 @@
+ fi
+ 
+ echo $ac_n "checking for size_t""... $ac_c" 1>&6
+-echo "configure:1669: checking for size_t" >&5
++echo "configure:1709: checking for size_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1674 "configure"
++#line 1714 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -1702,17 +1742,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:1706: checking for $ac_hdr" >&5
++echo "configure:1746: 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
+-#line 1711 "configure"
++#line 1751 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1716: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1756: \"$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*
+@@ -1741,12 +1781,12 @@
+ for ac_func in getpagesize
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:1745: checking for $ac_func" >&5
++echo "configure:1785: 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 <<EOF
+-#line 1750 "configure"
++#line 1790 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -1769,7 +1809,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1813: \"$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
+@@ -1794,7 +1834,7 @@
+ done
+ 
+ echo $ac_n "checking for working mmap""... $ac_c" 1>&6
+-echo "configure:1798: checking for working mmap" >&5
++echo "configure:1838: checking for working mmap" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1802,7 +1842,7 @@
+   ac_cv_func_mmap_fixed_mapped=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1806 "configure"
++#line 1846 "configure"
+ #include "confdefs.h"
+ 
+ /* Thanks to Mike Haertel and Jim Avera for this test.
+@@ -1942,7 +1982,7 @@
+ }
+ 
+ EOF
+-if { (eval echo configure:1946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:1986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_func_mmap_fixed_mapped=yes
+ else
+@@ -1965,7 +2005,7 @@
+ fi
+ 
+ echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
+-echo "configure:1969: checking for 8-bit clean memcmp" >&5
++echo "configure:2009: checking for 8-bit clean memcmp" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1973,7 +2013,7 @@
+   ac_cv_func_memcmp_clean=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1977 "configure"
++#line 2017 "configure"
+ #include "confdefs.h"
+ 
+ main()
+@@ -1983,7 +2023,7 @@
+ }
+ 
+ EOF
+-if { (eval echo configure:1987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:2027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_func_memcmp_clean=yes
+ else
+@@ -2001,12 +2041,12 @@
+ test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
+ 
+ echo $ac_n "checking for vprintf""... $ac_c" 1>&6
+-echo "configure:2005: checking for vprintf" >&5
++echo "configure:2045: checking for vprintf" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2010 "configure"
++#line 2050 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char vprintf(); below.  */
+@@ -2029,7 +2069,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_vprintf=yes"
+ else
+@@ -2053,12 +2093,12 @@
+ 
+ if test "$ac_cv_func_vprintf" != yes; then
+ echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
+-echo "configure:2057: checking for _doprnt" >&5
++echo "configure:2097: checking for _doprnt" >&5
+ if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2062 "configure"
++#line 2102 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char _doprnt(); below.  */
+@@ -2081,7 +2121,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func__doprnt=yes"
+ else
+@@ -2106,12 +2146,12 @@
+ fi
+ 
+ echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
+-echo "configure:2110: checking return type of signal handlers" >&5
++echo "configure:2150: checking return type of signal handlers" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2115 "configure"
++#line 2155 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -2128,7 +2168,7 @@
+ int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2132: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2172: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_type_signal=void
+ else
+@@ -2149,12 +2189,12 @@
+ for ac_func in getcwd gethostname mkdir re_comp regcomp select snprintf socket strdup strerror strstr fstat fchmod fchown utime utimes memmove sigset vsnprintf waitpid random srandom
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2153: checking for $ac_func" >&5
++echo "configure:2193: 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 <<EOF
+-#line 2158 "configure"
++#line 2198 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -2177,7 +2217,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2221: \"$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
+@@ -2202,7 +2242,7 @@
+ done
+ 
+ echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
+-echo "configure:2206: checking for socket in -lsocket" >&5
++echo "configure:2246: checking for socket in -lsocket" >&5
+ ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2210,7 +2250,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsocket  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2214 "configure"
++#line 2254 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -2221,7 +2261,7 @@
+ socket()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2265: \"$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
+@@ -2242,7 +2282,7 @@
+ fi
+ 
+ echo $ac_n "checking for t_accept in -lnsl""... $ac_c" 1>&6
+-echo "configure:2246: checking for t_accept in -lnsl" >&5
++echo "configure:2286: checking for t_accept in -lnsl" >&5
+ ac_lib_var=`echo nsl'_'t_accept | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2250,7 +2290,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lnsl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2254 "configure"
++#line 2294 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -2261,7 +2301,7 @@
+ t_accept()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2305: \"$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
+@@ -2282,8 +2322,91 @@
+ fi
+ 
+ 
++if test "$ac_cv_header_readline_h" = "yes" ||
++   test "$ac_cv_header_readline_readline_h" = "yes"; then
++    echo $ac_n "checking for tputs in -ltermcap""... $ac_c" 1>&6
++echo "configure:2329: checking for tputs in -ltermcap" >&5
++ac_lib_var=`echo termcap'_'tputs | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-ltermcap  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 2337 "configure"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char tputs();
++
++int main() {
++tputs()
++; return 0; }
++EOF
++if { (eval echo configure:2348: \"$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
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  echo $ac_n "checking for readline in -ledit""... $ac_c" 1>&6
++echo "configure:2364: checking for readline in -ledit" >&5
++ac_lib_var=`echo edit'_'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
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-ledit -ltermcap $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 2372 "configure"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char readline();
++
++int main() {
++readline()
++; return 0; }
++EOF
++if { (eval echo configure:2383: \"$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
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  cat >> confdefs.h <<\EOF
++#define HAVE_LIBEDIT 1
++EOF
++
++	     cat >> confdefs.h <<\EOF
++#define HAVE_READLINE 1
++EOF
++
++	     RL_LIBS="-ledit -ltermcap"
++else
++  echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
+-echo "configure:2287: checking for readline in -lreadline" >&5
++echo "configure:2410: 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
+@@ -2291,7 +2414,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lreadline  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2295 "configure"
++#line 2418 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -2302,7 +2425,7 @@
+ readline()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2429: \"$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
+@@ -2317,15 +2440,33 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  RL_LIBS="-lreadline"
++  cat >> confdefs.h <<\EOF
++#define HAVE_LIBREADLINE 1
++EOF
++
++		 cat >> confdefs.h <<\EOF
++#define HAVE_READLINE 1
++EOF
++
++		 RL_LIBS="-ledit -ltermcap"
++else
++  echo "$ac_t""no" 1>&6
++-ltermcap
++fi
++
++	    
++fi
++
++	
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
++fi
+ 
+ 
+ echo $ac_n "checking for gsm_decode in -lgsm""... $ac_c" 1>&6
+-echo "configure:2329: checking for gsm_decode in -lgsm" >&5
++echo "configure:2470: checking for gsm_decode in -lgsm" >&5
+ ac_lib_var=`echo gsm'_'gsm_decode | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2333,7 +2474,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lgsm  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2337 "configure"
++#line 2478 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -2344,7 +2485,7 @@
+ gsm_decode()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2489: \"$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
+@@ -2375,7 +2516,7 @@
+ 
+ 
+ echo $ac_n "checking for regncomp in -lrx""... $ac_c" 1>&6
+-echo "configure:2379: checking for regncomp in -lrx" >&5
++echo "configure:2520: checking for regncomp in -lrx" >&5
+ ac_lib_var=`echo rx'_'regncomp | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2383,7 +2524,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lrx  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2387 "configure"
++#line 2528 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -2394,7 +2535,7 @@
+ regncomp()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2539: \"$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
+@@ -2434,9 +2575,9 @@
+ 
+ if test -z "$RPLAY_TARGET"; then
+ echo $ac_n "checking for sun""... $ac_c" 1>&6
+-echo "configure:2438: checking for sun" >&5
++echo "configure:2579: checking for sun" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 2440 "configure"
++#line 2581 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef sun
+@@ -2460,7 +2601,7 @@
+ fi
+ if test "$RPLAY_TARGET"; then
+ 	echo $ac_n "checking for solaris""... $ac_c" 1>&6
+-echo "configure:2464: checking for solaris" >&5
++echo "configure:2605: checking for solaris" >&5
+ 	if test ! -f /vmunix; then
+ 		is_solaris=yes
+ 		RPLAY_TARGET="solaris"
+@@ -2473,9 +2614,9 @@
+ 
+ if test -z "$RPLAY_TARGET"; then
+ echo $ac_n "checking for linux""... $ac_c" 1>&6
+-echo "configure:2477: checking for linux" >&5
++echo "configure:2618: checking for linux" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 2479 "configure"
++#line 2620 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef linux
+@@ -2501,9 +2642,9 @@
+ 
+ if test -z "$RPLAY_TARGET"; then
+ echo $ac_n "checking for hpux""... $ac_c" 1>&6
+-echo "configure:2505: checking for hpux" >&5
++echo "configure:2646: checking for hpux" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 2507 "configure"
++#line 2648 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef __hpux
+@@ -2529,9 +2670,9 @@
+ 
+ if test -z "$RPLAY_TARGET"; then
+ echo $ac_n "checking for sgi""... $ac_c" 1>&6
+-echo "configure:2533: checking for sgi" >&5
++echo "configure:2674: checking for sgi" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 2535 "configure"
++#line 2676 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef sgi
+@@ -2553,22 +2694,22 @@
+ if test $is_sgi = "yes"; then
+ 	RPLAY_TARGET="sgi"
+ 	echo $ac_n "checking for multimedia development kit""... $ac_c" 1>&6
+-echo "configure:2557: checking for multimedia development kit" >&5
++echo "configure:2698: checking for multimedia development kit" >&5
+ 	for ac_hdr in audio.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2562: checking for $ac_hdr" >&5
++echo "configure:2703: 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
+-#line 2567 "configure"
++#line 2708 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2572: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2713: \"$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*
+@@ -2604,9 +2745,9 @@
+ 
+ if test -z "$RPLAY_TARGET"; then
+ echo $ac_n "checking for FreeBSD""... $ac_c" 1>&6
+-echo "configure:2608: checking for FreeBSD" >&5
++echo "configure:2749: checking for FreeBSD" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 2610 "configure"
++#line 2751 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef __FreeBSD__