cvs: /php4/ext/readline Makefile.in config.m4 readline.c

sas Tue May 2 06:26:48 2000 EDT Modified files: /php4/ext/readline Makefile.in config.m4 readline.c Log: Make readline compilable as shared module Index: php4/ext/readline/Makefile.in diff -u php4/ext/readline/Makefile.in:1.6 php4/ext/readline/Makefile.in:1.7 --- php4/ext/readline/Makefile.in:1.6 Tue May 2 00:38:31 2000 +++ php4/ext/readline/Makefile.in Tue May 2 06:26:48 2000 @@ -1,5 +1,7 @@ LTLIBRARY_NAME = libreadline.la LTLIBRARY_SOURCES = readline.c +LTLIBRARY_SHARED_NAME = readline.la +LTLIBRARY_SHARED_LIBADD = $(READLINE_SHARED_LIBADD) include $(top_srcdir)/build/dynlib.mk Index: php4/ext/readline/config.m4 diff -u php4/ext/readline/config.m4:1.7 php4/ext/readline/config.m4:1.8 --- php4/ext/readline/config.m4:1.7 Sun Mar 26 21:47:25 2000 +++ php4/ext/readline/config.m4 Tue May 2 06:26:48 2000 @@ -1,44 +1,34 @@ -dnl $Id: config.m4,v 1.7 2000/03/26 19:47:25 sas Exp $ +dnl $Id: config.m4,v 1.8 2000/05/02 04:26:48 sas Exp $ dnl config.m4 for extension readline dnl don't forget to call PHP_EXTENSION(readline) -AC_MSG_CHECKING(for readline support) -AC_ARG_WITH(readline, +PHP_ARG_WITH(readline,for readline support, [ --with-readline[=DIR] Include readline support. DIR is the readline - install directory.], -[ - if test "$withval" != "no"; then - for i in $withval /usr/local /usr; do - if test -f $i/include/readline/readline.h; then - READLINE_DIR=$i - fi - done - if test "$READLINE_DIR" = ""; then - AC_MSG_ERROR(Please reinstall readline - I cannot find readline.h) + install directory.]) + +if test "$PHP_READLINE" != "no"; then + for i in /usr/local /usr $PHP_READLINE; do + if test -f $i/include/readline/readline.h; then + READLINE_DIR=$i fi - AC_ADD_INCLUDE($READLINE_DIR/include) + done - AC_CHECK_LIB(ncurses, tgetent, [ - AC_ADD_LIBRARY(ncurses) ], [ - AC_CHECK_LIB(termcap, tgetent, [ - AC_ADD_LIBRARY(termcap) - ]) - ]) - - - AC_CHECK_LIB(tgetent, termcap) - AC_CHECK_LIB(tgetent, ncurses) - AC_ADD_LIBRARY_WITH_PATH(history, $READLINE_DIR/lib) - AC_ADD_LIBRARY_WITH_PATH(readline, $READLINE_DIR/lib) - - AC_MSG_RESULT(yes) - - AC_DEFINE(HAVE_LIBREADLINE, 1, [ ]) - PHP_EXTENSION(readline) - else - AC_MSG_RESULT(no) + if test -z "$READLINE_DIR"; then + AC_MSG_ERROR(Please reinstall readline - I cannot find readline.h) fi -],[ - AC_MSG_RESULT(no) -]) + AC_ADD_INCLUDE($READLINE_DIR/include) + + AC_CHECK_LIB(ncurses, tgetent, [ + AC_ADD_LIBRARY_WITH_PATH(ncurses,,READLINE_SHARED_LIBADD)],[ + AC_CHECK_LIB(termcap, tgetent, [ + AC_ADD_LIBRARY_WITH_PATH(termcap,,READLINE_SHARED_LIBADD)]) + ]) + + AC_ADD_LIBRARY_WITH_PATH(history, $READLINE_DIR/lib, READLINE_SHARED_LIBADD) + AC_ADD_LIBRARY_WITH_PATH(readline, $READLINE_DIR/lib, READLINE_SHARED_LIBADD) + PHP_SUBST(READLINE_SHARED_LIBADD) + + AC_DEFINE(HAVE_LIBREADLINE, 1, [ ]) + PHP_EXTENSION(readline, $ext_shared) +fi Index: php4/ext/readline/readline.c diff -u php4/ext/readline/readline.c:1.10 php4/ext/readline/readline.c:1.11 --- php4/ext/readline/readline.c:1.10 Mon Mar 6 19:41:15 2000 +++ php4/ext/readline/readline.c Tue May 2 06:26:48 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: readline.c,v 1.10 2000/03/06 18:41:15 ssb Exp $ */ +/* $Id: readline.c,v 1.11 2000/05/02 04:26:48 sas Exp $ */ /* {{{ includes & prototypes */ @@ -68,6 +68,10 @@ NULL, STANDARD_MODULE_PROPERTIES }; + +#ifdef COMPILE_DL_READLINE +ZEND_GET_MODULE(readline) +#endif PHP_MINIT_FUNCTION(readline) {