diff options
| author | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:34:59 -0400 |
|---|---|---|
| committer | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:34:59 -0400 |
| commit | ce7edc9b3c7370f32fec0bc7a8ec3e29ed9a5f61 (patch) | |
| tree | acdb9a8816483652a9db1a47db71df5df43707c5 /ext/gettext | |
| parent | 10f5b47dc7c1cf2b9a00991629f43652710322d3 (diff) | |
| download | php-ce7edc9b3c7370f32fec0bc7a8ec3e29ed9a5f61.tar.gz | |
Imported Upstream version 5.1.1upstream/5.1.1
Diffstat (limited to 'ext/gettext')
| -rw-r--r-- | ext/gettext/config.m4 | 6 | ||||
| -rw-r--r-- | ext/gettext/gettext.c | 4 | ||||
| -rw-r--r-- | ext/gettext/php_gettext.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/ext/gettext/config.m4 b/ext/gettext/config.m4 index 34930f3a7..b439540dd 100644 --- a/ext/gettext/config.m4 +++ b/ext/gettext/config.m4 @@ -1,9 +1,9 @@ dnl -dnl $Id: config.m4,v 1.13 2003/10/01 02:53:07 sniper Exp $ +dnl $Id: config.m4,v 1.15 2005/05/29 23:16:41 sniper Exp $ dnl PHP_ARG_WITH(gettext,for GNU gettext support, -[ --with-gettext[=DIR] Include GNU gettext support.]) +[ --with-gettext[=DIR] Include GNU gettext support]) if test "$PHP_GETTEXT" != "no"; then for i in $PHP_GETTEXT /usr/local /usr; do @@ -14,7 +14,7 @@ if test "$PHP_GETTEXT" != "no"; then AC_MSG_ERROR(Cannot locate header file libintl.h) fi - GETTEXT_LIBDIR=$GETTEXT_DIR/lib + GETTEXT_LIBDIR=$GETTEXT_DIR/$PHP_LIBDIR GETTEXT_INCDIR=$GETTEXT_DIR/include O_LDFLAGS=$LDFLAGS diff --git a/ext/gettext/gettext.c b/ext/gettext/gettext.c index c8b54dea1..19d5473a5 100644 --- a/ext/gettext/gettext.c +++ b/ext/gettext/gettext.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2004 The PHP Group | + | Copyright (c) 1997-2005 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.0 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gettext.c,v 1.44.2.1 2004/07/29 22:26:52 edink Exp $ */ +/* $Id: gettext.c,v 1.46 2005/08/03 14:07:14 sniper Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/ext/gettext/php_gettext.h b/ext/gettext/php_gettext.h index 19ff6dbde..932f5e1e6 100644 --- a/ext/gettext/php_gettext.h +++ b/ext/gettext/php_gettext.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2004 The PHP Group | + | Copyright (c) 1997-2005 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.0 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_gettext.h,v 1.19 2004/01/08 17:32:09 sniper Exp $ */ +/* $Id: php_gettext.h,v 1.20 2005/08/03 14:07:14 sniper Exp $ */ #ifndef PHP_GETTEXT_H #define PHP_GETTEXT_H |