subject:"\[PHP\-CVS\] cvs\: php\-src \/ext\/pdo

Re: [PHP-CVS] cvs: php-src /ext/pdo_firebird config.m4

2009-05-24 Thread Nuno Lopes

This changes the default directory of the lib, so I don't think it's 
suitable for a bugfix-only branch.
Anyway, noone complained about this problem (except myself), although it has 
been around forever.


Nuno

- Original Message -

And PHP_5_2 ..?


Nuno Lopes kirjoitti:

nlopess Sat May 23 13:52:53 2009 UTC

  Modified files:  /php-src/ext/pdo_firebird config.m4 Log:
  MFB: fix compilation of pdo_firebird and intl extension with 
ld --as-needed


http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_firebird/config.m4?r1=1.11r2=1.12diff_format=u
Index: php-src/ext/pdo_firebird/config.m4
diff -u php-src/ext/pdo_firebird/config.m4:1.11 
php-src/ext/pdo_firebird/config.m4:1.12

--- php-src/ext/pdo_firebird/config.m4:1.11 Fri Jul 25 13:38:40 2008
+++ php-src/ext/pdo_firebird/config.m4 Sat May 23 13:52:53 2009
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.11 2008/07/25 13:38:40 jani Exp $
+dnl $Id: config.m4,v 1.12 2009/05/23 13:52:53 nlopess Exp $
 dnl
 PHP_ARG_WITH(pdo-firebird,for Firebird support for PDO,
@@ -13,11 +13,13 @@
   fi
 if test $PHP_PDO_FIREBIRD = yes; then
-FIREBIRD_INCDIR=/opt/firebird/include
-FIREBIRD_LIBDIR=/opt/firebird/lib
+FIREBIRD_INCDIR=
+FIREBIRD_LIBDIR=
+FIREBIRD_LIBDIR_FLAG=
   else
 FIREBIRD_INCDIR=$PHP_PDO_FIREBIRD/include
 FIREBIRD_LIBDIR=$PHP_PDO_FIREBIRD/$PHP_LIBDIR
+FIREBIRD_LIBDIR_FLAG=-L$FIREBIRD_LIBDIR
   fi
 PHP_CHECK_LIBRARY(fbclient, isc_detach_database,
@@ -34,13 +36,13 @@
   ], [
 AC_MSG_ERROR([libfbclient, libgds or libib_util not found! Check 
config.log for more information.])

   ], [
--L$FIREBIRD_LIBDIR
+$FIREBIRD_LIBDIR_FLAG
   ])
 ], [
-  -L$FIREBIRD_LIBDIR
+  $FIREBIRD_LIBDIR_FLAG
 ])
   ], [
--L$FIREBIRD_LIBDIR
+$FIREBIRD_LIBDIR_FLAG
   ])
  PHP_CHECK_PDO_INCLUDES 



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

[PHP-CVS] cvs: php-src /ext/pdo_firebird config.m4

2009-05-23 Thread Nuno Lopes

nlopess Sat May 23 13:52:53 2009 UTC

  Modified files:  
/php-src/ext/pdo_firebird   config.m4 
  Log:
  MFB: fix compilation of pdo_firebird and intl extension with ld --as-needed
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_firebird/config.m4?r1=1.11r2=1.12diff_format=u
Index: php-src/ext/pdo_firebird/config.m4
diff -u php-src/ext/pdo_firebird/config.m4:1.11 
php-src/ext/pdo_firebird/config.m4:1.12
--- php-src/ext/pdo_firebird/config.m4:1.11 Fri Jul 25 13:38:40 2008
+++ php-src/ext/pdo_firebird/config.m4  Sat May 23 13:52:53 2009
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.11 2008/07/25 13:38:40 jani Exp $
+dnl $Id: config.m4,v 1.12 2009/05/23 13:52:53 nlopess Exp $
 dnl
 
 PHP_ARG_WITH(pdo-firebird,for Firebird support for PDO,
@@ -13,11 +13,13 @@
   fi
 
   if test $PHP_PDO_FIREBIRD = yes; then
-FIREBIRD_INCDIR=/opt/firebird/include
-FIREBIRD_LIBDIR=/opt/firebird/lib
+FIREBIRD_INCDIR=
+FIREBIRD_LIBDIR=
+FIREBIRD_LIBDIR_FLAG=
   else
 FIREBIRD_INCDIR=$PHP_PDO_FIREBIRD/include
 FIREBIRD_LIBDIR=$PHP_PDO_FIREBIRD/$PHP_LIBDIR
+FIREBIRD_LIBDIR_FLAG=-L$FIREBIRD_LIBDIR
   fi
 
   PHP_CHECK_LIBRARY(fbclient, isc_detach_database,
@@ -34,13 +36,13 @@
   ], [
 AC_MSG_ERROR([libfbclient, libgds or libib_util not found! Check 
config.log for more information.])
   ], [
--L$FIREBIRD_LIBDIR
+$FIREBIRD_LIBDIR_FLAG
   ])
 ], [
-  -L$FIREBIRD_LIBDIR
+  $FIREBIRD_LIBDIR_FLAG
 ])
   ], [
--L$FIREBIRD_LIBDIR
+$FIREBIRD_LIBDIR_FLAG
   ])
  
   PHP_CHECK_PDO_INCLUDES



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

Re: [PHP-CVS] cvs: php-src /ext/pdo_firebird config.m4

2009-05-23 Thread Jani Taskinen


And PHP_5_2 ..?


Nuno Lopes kirjoitti:

nlopess Sat May 23 13:52:53 2009 UTC

  Modified files:  
/php-src/ext/pdo_firebird	config.m4 
  Log:

  MFB: fix compilation of pdo_firebird and intl extension with ld --as-needed
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_firebird/config.m4?r1=1.11r2=1.12diff_format=u

Index: php-src/ext/pdo_firebird/config.m4
diff -u php-src/ext/pdo_firebird/config.m4:1.11 
php-src/ext/pdo_firebird/config.m4:1.12
--- php-src/ext/pdo_firebird/config.m4:1.11 Fri Jul 25 13:38:40 2008
+++ php-src/ext/pdo_firebird/config.m4  Sat May 23 13:52:53 2009
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.11 2008/07/25 13:38:40 jani Exp $
+dnl $Id: config.m4,v 1.12 2009/05/23 13:52:53 nlopess Exp $
 dnl
 
 PHP_ARG_WITH(pdo-firebird,for Firebird support for PDO,

@@ -13,11 +13,13 @@
   fi
 
   if test $PHP_PDO_FIREBIRD = yes; then

-FIREBIRD_INCDIR=/opt/firebird/include
-FIREBIRD_LIBDIR=/opt/firebird/lib
+FIREBIRD_INCDIR=
+FIREBIRD_LIBDIR=
+FIREBIRD_LIBDIR_FLAG=
   else
 FIREBIRD_INCDIR=$PHP_PDO_FIREBIRD/include
 FIREBIRD_LIBDIR=$PHP_PDO_FIREBIRD/$PHP_LIBDIR
+FIREBIRD_LIBDIR_FLAG=-L$FIREBIRD_LIBDIR
   fi
 
   PHP_CHECK_LIBRARY(fbclient, isc_detach_database,

@@ -34,13 +36,13 @@
   ], [
 AC_MSG_ERROR([libfbclient, libgds or libib_util not found! Check 
config.log for more information.])
   ], [
--L$FIREBIRD_LIBDIR
+$FIREBIRD_LIBDIR_FLAG
   ])
 ], [
-  -L$FIREBIRD_LIBDIR
+  $FIREBIRD_LIBDIR_FLAG
 ])
   ], [
--L$FIREBIRD_LIBDIR
+$FIREBIRD_LIBDIR_FLAG
   ])
  
   PHP_CHECK_PDO_INCLUDES







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

[PHP-CVS] cvs: php-src /ext/pdo_firebird config.m4 /ext/pdo_mysql config.m4 /ext/pdo_oci config.m4 /ext/pdo_odbc config.m4 /ext/pdo_pgsql config.m4 /ext/pdo_sqlite config.m4

2005-02-28 Thread Rasmus Lerdorf

rasmus  Mon Feb 28 03:18:47 2005 EDT

  Modified files:  
/php-src/ext/pdo_firebird   config.m4 
/php-src/ext/pdo_mysql  config.m4 
/php-src/ext/pdo_ociconfig.m4 
/php-src/ext/pdo_odbc   config.m4 
/php-src/ext/pdo_pgsql  config.m4 
/php-src/ext/pdo_sqlite config.m4 
  Log:
  If pdo is disabled, skip all the pdo extensions.
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_firebird/config.m4?r1=1.5r2=1.6ty=u
Index: php-src/ext/pdo_firebird/config.m4
diff -u php-src/ext/pdo_firebird/config.m4:1.5 
php-src/ext/pdo_firebird/config.m4:1.6
--- php-src/ext/pdo_firebird/config.m4:1.5  Wed Feb 23 12:44:22 2005
+++ php-src/ext/pdo_firebird/config.m4  Mon Feb 28 03:18:46 2005
@@ -1,7 +1,9 @@
 dnl
-dnl $Id: config.m4,v 1.5 2005/02/23 17:44:22 abies Exp $
+dnl $Id: config.m4,v 1.6 2005/02/28 08:18:46 rasmus Exp $
 dnl
 
+if test $PHP_PDO != no; then
+
 PHP_ARG_WITH(pdo-firebird,for Firebird support for PDO,
 [  --with-pdo-firebird[=DIR]  Include Firebird support for PDO.  DIR is the 
Firebird base
   install directory, defaults to /opt/firebird])
@@ -57,3 +59,5 @@
   PHP_SUBST(PDO_FIREBIRD_SHARED_LIBADD)
   PHP_ADD_EXTENSION_DEP(pdo_firebird, pdo)
 fi
+
+fi
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/config.m4?r1=1.18r2=1.19ty=u
Index: php-src/ext/pdo_mysql/config.m4
diff -u php-src/ext/pdo_mysql/config.m4:1.18 
php-src/ext/pdo_mysql/config.m4:1.19
--- php-src/ext/pdo_mysql/config.m4:1.18Wed Feb 16 23:23:14 2005
+++ php-src/ext/pdo_mysql/config.m4 Mon Feb 28 03:18:47 2005
@@ -1,7 +1,9 @@
 dnl
-dnl $Id: config.m4,v 1.18 2005/02/17 04:23:14 wez Exp $
+dnl $Id: config.m4,v 1.19 2005/02/28 08:18:47 rasmus Exp $
 dnl
 
+if test $PHP_PDO != no; then
+
 AC_DEFUN([PDO_MYSQL_LIB_CHK], [
   str=$PDO_MYSQL_DIR/$1/libmysqlclient.*
   for j in `echo $str`; do
@@ -81,3 +83,5 @@
   PHP_SUBST_OLD(PDO_MYSQL_LIBS)
   PHP_SUBST_OLD(PDO_MYSQL_INCLUDE)
 fi
+
+fi
http://cvs.php.net/diff.php/php-src/ext/pdo_oci/config.m4?r1=1.10r2=1.11ty=u
Index: php-src/ext/pdo_oci/config.m4
diff -u php-src/ext/pdo_oci/config.m4:1.10 php-src/ext/pdo_oci/config.m4:1.11
--- php-src/ext/pdo_oci/config.m4:1.10  Wed Feb 16 23:23:14 2005
+++ php-src/ext/pdo_oci/config.m4   Mon Feb 28 03:18:47 2005
@@ -1,4 +1,6 @@
-dnl $Id: config.m4,v 1.10 2005/02/17 04:23:14 wez Exp $
+dnl $Id: config.m4,v 1.11 2005/02/28 08:18:47 rasmus Exp $
+
+if test $PHP_PDO != no; then
 
 AC_DEFUN([AC_PDO_OCI_VERSION],[
   AC_MSG_CHECKING([Oracle version])
@@ -180,3 +182,5 @@
   PHP_ADD_EXTENSION_DEP(pdo_oci, pdo)
   
 fi
+
+fi
http://cvs.php.net/diff.php/php-src/ext/pdo_odbc/config.m4?r1=1.14r2=1.15ty=u
Index: php-src/ext/pdo_odbc/config.m4
diff -u php-src/ext/pdo_odbc/config.m4:1.14 php-src/ext/pdo_odbc/config.m4:1.15
--- php-src/ext/pdo_odbc/config.m4:1.14 Wed Feb 16 23:23:14 2005
+++ php-src/ext/pdo_odbc/config.m4  Mon Feb 28 03:18:47 2005
@@ -1,7 +1,9 @@
-dnl $Id: config.m4,v 1.14 2005/02/17 04:23:14 wez Exp $
+dnl $Id: config.m4,v 1.15 2005/02/28 08:18:47 rasmus Exp $
 dnl config.m4 for extension pdo_odbc
 dnl vim:et:sw=2:ts=2:
 
+if test $PHP_PDO != no; then
+
 AC_DEFUN([PDO_ODBC_HELP_TEXT], [[
  --with-pdo-odbc=flavour,dir  Add support for flavour ODBC drivers,
   looking for include and lib dirs under dir
@@ -147,3 +149,4 @@
   PHP_ADD_EXTENSION_DEP(pdo_odbc, pdo)
 fi
 
+fi
http://cvs.php.net/diff.php/php-src/ext/pdo_pgsql/config.m4?r1=1.6r2=1.7ty=u
Index: php-src/ext/pdo_pgsql/config.m4
diff -u php-src/ext/pdo_pgsql/config.m4:1.6 php-src/ext/pdo_pgsql/config.m4:1.7
--- php-src/ext/pdo_pgsql/config.m4:1.6 Wed Feb 16 23:23:14 2005
+++ php-src/ext/pdo_pgsql/config.m4 Mon Feb 28 03:18:47 2005
@@ -1,7 +1,9 @@
 dnl
-dnl $Id: config.m4,v 1.6 2005/02/17 04:23:14 wez Exp $
+dnl $Id: config.m4,v 1.7 2005/02/28 08:18:47 rasmus Exp $
 dnl
 
+if test $PHP_PDO != no; then
+
 AC_DEFUN([PHP_PGSQL_CHECK_FUNCTIONS],[
 ])
 
@@ -112,3 +114,5 @@
   PHP_NEW_EXTENSION(pdo_pgsql, pdo_pgsql.c pgsql_driver.c pgsql_statement.c, 
$ext_shared,,-I$pdo_inc_path $PDO_PGSQL_CFLAGS)
   PHP_ADD_EXTENSION_DEP(pdo_pgsql, pdo) 
 fi
+
+fi
http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/config.m4?r1=1.11r2=1.12ty=u
Index: php-src/ext/pdo_sqlite/config.m4
diff -u php-src/ext/pdo_sqlite/config.m4:1.11 
php-src/ext/pdo_sqlite/config.m4:1.12
--- php-src/ext/pdo_sqlite/config.m4:1.11   Sun Feb 27 22:21:52 2005
+++ php-src/ext/pdo_sqlite/config.m4Mon Feb 28 03:18:47 2005
@@ -1,7 +1,9 @@
-dnl $Id: config.m4,v 1.11 2005/02/28 03:21:52 wez Exp $
+dnl $Id: config.m4,v 1.12 2005/02/28 08:18:47 rasmus Exp $
 dnl config.m4 for extension pdo_sqlite
 dnl vim:et:sw=2:ts=2:
 
+if test $PHP_PDO != no; then
+
 PHP_ARG_WITH(pdo-sqlite, for sqlite 3 driver for PDO,
 [  --with-pdo-sqlite Include PDO sqlite 3 support],yes)
 
@@ -116,3 +118,5 @@
   fi
   PHP_ADD_EXTENSION_DEP(pdo_sqlite, pdo)
 fi
+
+fi

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

[PHP-CVS] cvs: php-src /ext/pdo_firebird config.m4

2005-02-23 Thread Ard Biesheuvel

abies   Wed Feb 23 12:44:23 2005 EDT

  Modified files:  
/php-src/ext/pdo_firebird   config.m4 
  Log:
  Added search for libfbclient
  
http://cvs.php.net/diff.php/php-src/ext/pdo_firebird/config.m4?r1=1.4r2=1.5ty=u
Index: php-src/ext/pdo_firebird/config.m4
diff -u php-src/ext/pdo_firebird/config.m4:1.4 
php-src/ext/pdo_firebird/config.m4:1.5
--- php-src/ext/pdo_firebird/config.m4:1.4  Wed Feb 16 23:23:14 2005
+++ php-src/ext/pdo_firebird/config.m4  Wed Feb 23 12:44:22 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.4 2005/02/17 04:23:14 wez Exp $
+dnl $Id: config.m4,v 1.5 2005/02/23 17:44:22 abies Exp $
 dnl
 
 PHP_ARG_WITH(pdo-firebird,for Firebird support for PDO,
@@ -15,15 +15,22 @@
 FIREBIRD_LIBDIR=$PHP_PDO_FIREBIRD/lib
   fi
 
-  PHP_CHECK_LIBRARY(gds, isc_detach_database,
+  PHP_CHECK_LIBRARY(fbclient, isc_detach_database,
   [
-FIREBIRD_LIBNAME=gds
+FIREBIRD_LIBNAME=fbclient
   ], [
-PHP_CHECK_LIBRARY(ib_util, isc_detach_database,
+PHP_CHECK_LIBRARY(gds, isc_detach_database,
 [
-  FIREBIRD_LIBNAME=ib_util
+  FIREBIRD_LIBNAME=gds
 ], [
-  AC_MSG_ERROR([libgds or libib_util not found! Check config.log for more 
information.])
+  PHP_CHECK_LIBRARY(ib_util, isc_detach_database,
+  [
+FIREBIRD_LIBNAME=ib_util
+  ], [
+AC_MSG_ERROR([libfbclient, libgds or libib_util not found! Check 
config.log for more information.])
+  ], [
+-L$FIREBIRD_LIBDIR
+  ])
 ], [
   -L$FIREBIRD_LIBDIR
 ])

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

Re: [PHP-CVS] cvs: php-src /ext/pdo_firebird config.m4

[PHP-CVS] cvs: php-src /ext/pdo_firebird config.m4

Re: [PHP-CVS] cvs: php-src /ext/pdo_firebird config.m4

[PHP-CVS] cvs: php-src /ext/pdo_firebird config.m4 /ext/pdo_mysql config.m4 /ext/pdo_oci config.m4 /ext/pdo_odbc config.m4 /ext/pdo_pgsql config.m4 /ext/pdo_sqlite config.m4

[PHP-CVS] cvs: php-src /ext/pdo_firebird config.m4

5 matches

Site Navigation

Mail list logo

Footer information