diff options
Diffstat (limited to 'ext/recode')
| -rw-r--r-- | ext/recode/config.m4 | 11 | ||||
| -rw-r--r-- | ext/recode/config9.m4 | 4 | ||||
| -rw-r--r-- | ext/recode/php_recode.h | 2 | ||||
| -rw-r--r-- | ext/recode/recode.c | 3 |
4 files changed, 5 insertions, 15 deletions
diff --git a/ext/recode/config.m4 b/ext/recode/config.m4 index 7f394d0465..bb627d4a7a 100644 --- a/ext/recode/config.m4 +++ b/ext/recode/config.m4 @@ -1,6 +1,4 @@ -dnl -dnl $Id$ -dnl +dnl config.m4 for extension recode PHP_ARG_WITH(recode,for recode support, [ --with-recode[=DIR] Include recode support]) @@ -39,12 +37,11 @@ if test "$PHP_RECODE" != "no"; then old_LIBS=$LIBS LDFLAGS="$LDFLAGS -L$RECODE_DIR/$RECODE_LIB" LIBS="$LIBS -lrecode" - AC_TRY_LINK( - [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ char *program_name; - ],[ + ]],[[ recode_format_table(); - ],[ + ]])],[ PHP_ADD_LIBRARY_DEFER_WITH_PATH(recode, $RECODE_DIR/$RECODE_LIB, RECODE_SHARED_LIBADD) AC_DEFINE(HAVE_BROKEN_RECODE, 1, [Whether we have librecode 3.5]) ],[ diff --git a/ext/recode/config9.m4 b/ext/recode/config9.m4 index 66df50e221..5f85655598 100644 --- a/ext/recode/config9.m4 +++ b/ext/recode/config9.m4 @@ -1,6 +1,4 @@ -dnl -dnl $Id$ -dnl +dnl config.m4 for extension recode dnl Check for extensions with which Recode can not work if test "$PHP_RECODE" != "no"; then diff --git a/ext/recode/php_recode.h b/ext/recode/php_recode.h index f56858a7a9..846b541948 100644 --- a/ext/recode/php_recode.h +++ b/ext/recode/php_recode.h @@ -16,8 +16,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - #ifndef PHP_RECODE_H #define PHP_RECODE_H diff --git a/ext/recode/recode.c b/ext/recode/recode.c index 8850a0f49a..4f9502cb4a 100644 --- a/ext/recode/recode.c +++ b/ext/recode/recode.c @@ -16,8 +16,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ - /* {{{ includes & prototypes */ #ifdef HAVE_CONFIG_H @@ -135,7 +133,6 @@ PHP_MINFO_FUNCTION(recode) { php_info_print_table_start(); php_info_print_table_row(2, "Recode Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Id$"); php_info_print_table_end(); } |
