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

sas Wed May 24 00:26:51 2000 EDT Modified files: /php4/ext/gettext Makefile.in config.m4 gettext.c Log: Make gettext extension compilable as shared module. Index: php4/ext/gettext/Makefile.in diff -u php4/ext/gettext/Makefile.in:1.7 php4/ext/gettext/Makefile.in:1.8 --- php4/ext/gettext/Makefile.in:1.7 Tue May 2 00:38:28 2000 +++ php4/ext/gettext/Makefile.in Wed May 24 00:26:51 2000 @@ -1,5 +1,7 @@ LTLIBRARY_NAME = libgettext.la LTLIBRARY_SOURCES = gettext.c +LTLIBRARY_SHARED_NAME = gettext.la +LTLIBRARY_SHARED_LIBADD = $(GETTEXT_SHARED_LIBADD) include $(top_srcdir)/build/dynlib.mk Index: php4/ext/gettext/config.m4 diff -u php4/ext/gettext/config.m4:1.4 php4/ext/gettext/config.m4:1.5 --- php4/ext/gettext/config.m4:1.4 Thu Dec 30 05:52:02 1999 +++ php4/ext/gettext/config.m4 Wed May 24 00:26:51 2000 @@ -1,45 +1,41 @@ -dnl $Id: config.m4,v 1.4 1999/12/30 04:52:02 sas Exp $ +dnl $Id: config.m4,v 1.5 2000/05/23 22:26:51 sas Exp $ dnl config.m4 for extension gettext dnl don't forget to call PHP_EXTENSION(gettext) -AC_MSG_CHECKING(whether to include GNU gettext support) -AC_ARG_WITH(gettext, +PHP_ARG_WITH(gettext,whether to include GNU gettext support, [ --with-gettext[=DIR] Include GNU gettext support. DIR is the gettext - install directory, defaults to /usr/local], -[ - if test "$withval" != "no"; then - if test "$withval" = "yes"; then - GETTEXT_INCDIR=/usr/local/include - test -f /usr/local/include/libintl.h && GETTEXT_INCDIR=/usr/local/include/ - GETTEXT_LIBDIR=/usr/local/lib - else - GETTEXT_INCDIR=$withval/include - test -f $withval/include/libintl.h && GETTEXT_INCDIR=$withval/include - GETTEXT_LIBDIR=$withval/lib + install directory, defaults to /usr/local]) + +if test "$PHP_GETTEXT" != "no"; then + for i in /usr /usr/local $PHP_GETTEXT; do + if test -r $i/include/libintl.h; then + GETTEXT_DIR=$i fi - GETTEXT_INCLUDE=-I$GETTEXT_INCDIR - GETTEXT_LFLAGS=-L$GETTEXT_LIBDIR - O_CPPFLAGS="$CPPFLAGS" - O_LDFLAGS=$LDFLAGS - CPPFLAGS="$CPPFLAGS -I$GETTEXT_INCDIR" - LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR" - GETTEXT_LIBS= - AC_MSG_RESULT(yes) - AC_CHECK_LIB(intl, bindtextdomain, GETTEXT_LIBS="-lintl",[ - AC_CHECK_LIB(c, bindtextdomain, GETTEXT_LIBS=,[ - AC_MSG_ERROR(Unable to find required gettext library) - ],) - ],) + done + + if test -z "$GETTEXT_DIR"; then + AC_MSG_ERROR(Cannot locate header file libintl.h) + fi - AC_DEFINE(HAVE_LIBINTL,1,[ ]) - PHP_EXTENSION(gettext) + GETTEXT_LIBDIR=$GETTEXT_DIR/lib + GETTEXT_INCDIR=$GETTEXT_DIR/include + + O_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR" + AC_CHECK_LIB(intl, bindtextdomain, GETTEXT_LIBS="intl",[ + AC_CHECK_LIB(c, bindtextdomain, GETTEXT_LIBS= ,[ + AC_MSG_ERROR(Unable to find required gettext library) + ]) + ]) + LDFLAGS="$O_LDFLAGS" - EXTRA_LIBS="$EXTRA_LIBS $GETTEXT_LFLAGS $GETTEXT_LIBS" - INCLUDES="$INCLUDES $GETTEXT_INCLUDE" + AC_DEFINE(HAVE_LIBINTL,1,[ ]) + PHP_EXTENSION(gettext, $ext_shared) + PHP_SUBST(GETTEXT_SHARED_LIBADD) - else - AC_MSG_RESULT(no) + if test -n "$GETTEXT_LIBS"; then + AC_ADD_LIBRARY_WITH_PATH($GETTEXT_LIBS, $GETTEXT_LIBDIR, GETTEXT_SHARED_LIBADD) fi -],[ - AC_MSG_RESULT(no) -]) + + AC_ADD_INCLUDE($GETTEXT_INCDIR) +fi Index: php4/ext/gettext/gettext.c diff -u php4/ext/gettext/gettext.c:1.17 php4/ext/gettext/gettext.c:1.18 --- php4/ext/gettext/gettext.c:1.17 Thu May 18 17:34:25 2000 +++ php4/ext/gettext/gettext.c Wed May 24 00:26:51 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gettext.c,v 1.17 2000/05/18 15:34:25 zeev Exp $ */ +/* $Id: gettext.c,v 1.18 2000/05/23 22:26:51 sas Exp $ */ #include <stdio.h> #include "php.h" @@ -40,6 +40,10 @@ zend_module_entry php_gettext_module_entry = { "gettext", php_gettext_functions, NULL, NULL, NULL, NULL, PHP_MINFO(gettext), STANDARD_MODULE_PROPERTIES }; + +#ifdef COMPILE_DL_GETTEXT +ZEND_GET_MODULE(php_gettext) +#endif PHP_MINFO_FUNCTION(gettext) {