[PHP-CVS] cvs: php-src /ext/recode config9.m4

2008-12-01 Thread Johannes Schlüter
johannesMon Dec  1 23:29:42 2008 UTC

  Modified files:  
/php-src/ext/recode config9.m4 
  Log:
  - hash_insert was renamed in MySQL 5.0 so we can safely use recode and mysql
with recent libmysql versions [DOC]
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/recode/config9.m4?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/recode/config9.m4
diff -u php-src/ext/recode/config9.m4:1.2 php-src/ext/recode/config9.m4:1.3
--- php-src/ext/recode/config9.m4:1.2   Tue Nov  9 16:11:13 2004
+++ php-src/ext/recode/config9.m4   Mon Dec  1 23:29:42 2008
@@ -1,11 +1,16 @@
 dnl
-dnl $Id: config9.m4,v 1.2 2004/11/09 16:11:13 jorton Exp $
+dnl $Id: config9.m4,v 1.3 2008/12/01 23:29:42 johannes Exp $
 dnl
 
 dnl Check for extensions with which Recode can not work
 if test $PHP_RECODE != no; then
   test $PHP_IMAP  != no  recode_conflict=$recode_conflict imap
-  test $PHP_MYSQL != no  recode_conflict=$recode_conflict mysql
+
+  if test -n $MYSQL_LIBNAME; then
+PHP_CHECK_LIBRARY($MYSQL_LIBNAME, hash_insert, [
+  recode_conflict=$recode_conflict mysql
+])
+  fi
 
   if test -n $recode_conflict; then
 AC_MSG_ERROR([recode extension can not be configured together 
with:$recode_conflict])



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src /ext/recode config9.m4

2004-11-09 Thread Joe Orton
jorton  Tue Nov  9 11:11:13 2004 EDT

  Modified files:  
/php-src/ext/recode config9.m4 
  Log:
  Fix --with-recode since PHP_YAZ is never defined.
  
http://cvs.php.net/diff.php/php-src/ext/recode/config9.m4?r1=1.1r2=1.2ty=u
Index: php-src/ext/recode/config9.m4
diff -u php-src/ext/recode/config9.m4:1.1 php-src/ext/recode/config9.m4:1.2
--- php-src/ext/recode/config9.m4:1.1   Sun Feb 15 12:54:19 2004
+++ php-src/ext/recode/config9.m4   Tue Nov  9 11:11:13 2004
@@ -1,12 +1,11 @@
 dnl
-dnl $Id: config9.m4,v 1.1 2004/02/15 17:54:19 sniper Exp $
+dnl $Id: config9.m4,v 1.2 2004/11/09 16:11:13 jorton Exp $
 dnl
 
 dnl Check for extensions with which Recode can not work
 if test $PHP_RECODE != no; then
   test $PHP_IMAP  != no  recode_conflict=$recode_conflict imap
   test $PHP_MYSQL != no  recode_conflict=$recode_conflict mysql
-  test $PHP_YAZ   != no  recode_conflict=$recode_conflict yaz
 
   if test -n $recode_conflict; then
 AC_MSG_ERROR([recode extension can not be configured together 
with:$recode_conflict])

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src /ext/recode config9.m4

2004-02-15 Thread Jani Taskinen
sniper  Sun Feb 15 12:54:20 2004 EDT

  Added files: 
/php-src/ext/recode config9.m4 
  Log:
  Prevent bug reports like #27260
  

http://cvs.php.net/co.php/php-src/ext/recode/config9.m4?r=1.1p=1
Index: php-src/ext/recode/config9.m4
+++ php-src/ext/recode/config9.m4
dnl
dnl $Id: config9.m4,v 1.1 2004/02/15 17:54:19 sniper Exp $
dnl

dnl Check for extensions with which Recode can not work
if test $PHP_RECODE != no; then
  test $PHP_IMAP  != no  recode_conflict=$recode_conflict imap
  test $PHP_MYSQL != no  recode_conflict=$recode_conflict mysql
  test $PHP_YAZ   != no  recode_conflict=$recode_conflict yaz

  if test -n $recode_conflict; then
AC_MSG_ERROR([recode extension can not be configured together 
with:$recode_conflict])
  fi
fi

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php