[Toxine-cvs] CVS: toxine Makefile.am,1.8,1.9 configure.ac,1.5,1.6

[Daniel Caujolle-B. <f1...@us...>]

Update of /cvsroot/toxine/toxine
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32766

Modified Files:
	Makefile.am configure.ac 
Log Message:
don't need embedded readline anymore

Index: Makefile.am
===================================================================
RCS file: /cvsroot/toxine/toxine/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.am	1 Sep 2002 16:05:30 -0000	1.8
+++ Makefile.am	8 Apr 2004 15:13:57 -0000	1.9
@@ -4,7 +4,7 @@
 
 AUTOMAKE_OPTIONS = 1.3
 
-SUBDIRS = doc m4 misc readline src
+SUBDIRS = doc m4 misc src
 
 EXTRA_DIST = cvscompile.sh @DEPCOMP@
 
@@ -61,4 +61,4 @@
 	-rm -f Makefile.in configure acinclude.m4 aclocal.m4
 	-rm -f config.h.in stamp-h.in ltconfig ltmain.sh
 	-rm -f config.guess config.sub install-sh missing mkinstalldirs
-	-rm -f depcomp config.log config.status libtool-nofpic
+	-rm -f depcomp config.log config.status libtool-nofpic stamp-h

Index: configure.ac
===================================================================
RCS file: /cvsroot/toxine/toxine/configure.ac,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- configure.ac	15 Oct 2003 17:32:51 -0000	1.5
+++ configure.ac	8 Apr 2004 15:13:57 -0000	1.6
@@ -158,71 +158,11 @@
 dnl
 dnl readline
 dnl
-dnl configure defaults
-LIBVERSION=4.2a
-opt_curses=no
-opt_shared=no
-
-dnl arguments to configure
-AC_ARG_WITH(curses, 
-  [  --with-curses           use the curses library instead of the termcap library],
-  opt_curses=$withval)
-
-if test "$opt_curses" = "yes"; then
-	prefer_curses=yes
+AC_CHECK_READLINE
+AM_CONDITIONAL(HAVE_READLINE, test x"$have_readline" = "xyes")
+if test x"$have_readline" != "xyes"; then
+  AC_MSG_ERROR([*** no readline found, toxine can't build ***])
 fi
-AC_TYPE_SIGNAL([])
-
-AC_HEADER_STAT
-AC_HEADER_DIRENT
-AC_CHECK_FUNCS(lstat memmove putenv select setenv setlocale \
-	strcasecmp strpbrk tcgetattr vsnprintf isascii isxdigit getpwuid_r)
-
-AC_FUNC_STRCOLL
-
-AC_CHECK_HEADERS(unistd.h stdlib.h varargs.h stdarg.h string.h strings.h \
-		limits.h sys/ptem.h sys/pte.h sys/stream.h sys/select.h \
-		termcap.h termios.h termio.h sys/file.h locale.h memory.h)
-
-dnl BASH_SYS_SIGNAL_VINTAGE dnl pure 2.50
-dnl BASH_SYS_REINSTALL_SIGHANDLERS dnl pure 2.50
-BASH_SIGNAL_CHECK
-BASH_REINSTALL_SIGHANDLERS
-
-BASH_FUNC_POSIX_SETJMP
-BASH_FUNC_LSTAT
-BASH_CHECK_GETPW_FUNCS
-BASH_FUNC_STRCOLL
-
-BASH_TYPE_SIGHANDLER
-BASH_HAVE_TIOCGWINSZ
-BASH_HAVE_TIOCSTAT
-BASH_HAVE_FIONREAD
-BASH_MISC_SPEED_T
-BASH_STRUCT_WINSIZE
-BASH_STRUCT_DIRENT_D_INO
-BASH_STRUCT_DIRENT_D_FILENO
-dnl yuck
-case "$host_os" in
-aix*)   prefer_curses=yes ;;
-esac
-
-BASH_CHECK_LIB_TERMCAP([],
-                       AC_MSG_RESULT([*** All of READLINE dependent parts will be disabled ***]))
-
-case "$host_cpu" in
-*cray*)	READLINE_LOCAL_CFLAGS=-DCRAY ;;
-*s390*) READLINE_LOCAL_CFLAGS=-fsigned-char ;;
-esac
-
-case "$host_os" in
-isc*)	READLINE_LOCAL_CFLAGS=-Disc386 ;;
-esac
-
-AC_SUBST(READLINE_LOCAL_CFLAGS)
-AC_SUBST(TERMCAP_LIB)
-AC_SUBST(LIBVERSION)
-AM_CONDITIONAL(HAVE_TERMCAP, test x"$no_termcap" != "xyes")
 
 dnl
 dnl ncurses
@@ -497,7 +437,6 @@
 misc/relchk.sh
 misc/toxine.spec
 misc/dvdplayer.sh
-readline/Makefile
 m4/Makefile
 src/Makefile
 src/plugins/Makefile