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

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

2008-10-04 Thread Felipe Pena

felipe  Sat Oct  4 12:51:51 2008 UTC

  Modified files:  
/php-src/ext/pdo_dblib  config.m4 
  Log:
  - Fixed bug #44991 (Compile Failure With freetds0.82) (patch by matthias at 
dsx dot at)
  - MFB: Fix #35032; pdo_dblib doesn't find includes on some systems
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_dblib/config.m4?r1=1.6r2=1.7diff_format=u
Index: php-src/ext/pdo_dblib/config.m4
diff -u php-src/ext/pdo_dblib/config.m4:1.6 php-src/ext/pdo_dblib/config.m4:1.7
--- php-src/ext/pdo_dblib/config.m4:1.6 Fri Jul 25 13:38:40 2008
+++ php-src/ext/pdo_dblib/config.m4 Sat Oct  4 12:51:51 2008
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.6 2008/07/25 13:38:40 jani Exp $
+dnl $Id: config.m4,v 1.7 2008/10/04 12:51:51 felipe Exp $
 dnl
 
 PHP_ARG_WITH(pdo-dblib, for PDO_DBLIB support via FreeTDS,
@@ -11,13 +11,17 @@
 AC_MSG_ERROR([PDO is not enabled! Add --enable-pdo to your configure 
line.])
   fi
 
-  PDO_FREETDS_INSTALLATION_DIR=
   if test $PHP_PDO_DBLIB = yes; then
 
 for i in /usr/local /usr; do
-  if test -f $i/include/tds.h; then
+  if test -f $i/include/sybdb.h; then
 PDO_FREETDS_INSTALLATION_DIR=$i
+PDO_FREETDS_INCLUDE_DIR=$i/include
 break
+  elif test -f $i/include/freetds/sybdb.h; then
+PDO_FREETDS_INSTALLATION_DIR=$i
+PDO_FREETDS_INCLUDE_DIR=$i/include/freetds
+break;
   fi
 done
 
@@ -27,8 +31,12 @@
 
   elif test $PHP_PDO_DBLIB != no; then
 
-if test -f $PHP_PDO_DBLIB/include/tds.h; then
+if test -f $PHP_PDO_DBLIB/include/sybdb.h; then
+  PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB
+  PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include
+elif test -f $PHP_PDO_DBLIB/include/freetds/sybdb.h; then
   PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB
+  PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include/freetds
 else
   AC_MSG_ERROR(Directory $PHP_PDO_DBLIB is not a FreeTDS installation 
directory)
 fi
@@ -38,15 +46,13 @@
 PHP_LIBDIR=lib
   fi
 
-  if test ! -r $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.a  test ! 
-r $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.so; then
- AC_MSG_ERROR(Could not find 
$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.[a|so])
+  if test ! -r $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a  test 
! -r $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so; then
+ AC_MSG_ERROR(Could not find 
$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.[a|so])
   fi
 
-  PDO_DBLIB_INCDIR=$PDO_FREETDS_INSTALLATION_DIR/include
-  PDO_DBLIB_LIBDIR=$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR
+  PHP_ADD_INCLUDE($PDO_FREETDS_INCLUDE_DIR)
+  PHP_ADD_LIBRARY_WITH_PATH(sybdb, $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR, 
PDO_DBLIB_SHARED_LIBADD)
 
-  PHP_ADD_INCLUDE($PDO_DBLIB_INCDIR)
-  PHP_ADD_LIBRARY_WITH_PATH(sybdb, $PDO_DBLIB_LIBDIR, PDO_DBLIB_SHARED_LIBADD)
   ifdef([PHP_CHECK_PDO_INCLUDES],
   [
 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_dblib config.m4

2005-11-10 Thread Jani Taskinen

sniper  Thu Nov 10 03:02:21 2005 EDT

  Modified files:  
/php-src/ext/pdo_dblib  config.m4 
  Log:
  fix configure help
  
http://cvs.php.net/diff.php/php-src/ext/pdo_dblib/config.m4?r1=1.3r2=1.4ty=u
Index: php-src/ext/pdo_dblib/config.m4
diff -u php-src/ext/pdo_dblib/config.m4:1.3 php-src/ext/pdo_dblib/config.m4:1.4
--- php-src/ext/pdo_dblib/config.m4:1.3 Sat Sep 24 19:22:43 2005
+++ php-src/ext/pdo_dblib/config.m4 Thu Nov 10 03:02:21 2005
@@ -1,12 +1,11 @@
 dnl
-dnl $Id: config.m4,v 1.3 2005/09/24 23:22:43 sniper Exp $
+dnl $Id: config.m4,v 1.4 2005/11/10 08:02:21 sniper Exp $
 dnl
 
 if test $PHP_PDO != no; then
 PHP_ARG_WITH(pdo-dblib, for PDO_DBLIB support via FreeTDS,
-[  --with-pdo-dblib[=DIR]  Include PDO_DBLIB-DB support.  DIR is the 
FreeTDS home
-  directory])
-
+[  --with-pdo-dblib[=DIR]Include PDO_DBLIB-DB support. DIR is the FreeTDS
+home directory])
 
 if test $PHP_PDO_DBLIB != no; then
 

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

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

2005-09-24 Thread Jani Taskinen

sniper  Sat Sep 24 19:22:45 2005 EDT

  Modified files:  
/php-src/ext/pdo_dblib  config.m4 
/php-src/ext/pdo_mysql  config.m4 
/php-src/ext/pdo_ociconfig.m4 
/php-src/ext/pdo_sqlite config.m4 
  Log:
  fix typo
  
http://cvs.php.net/diff.php/php-src/ext/pdo_dblib/config.m4?r1=1.2r2=1.3ty=u
Index: php-src/ext/pdo_dblib/config.m4
diff -u php-src/ext/pdo_dblib/config.m4:1.2 php-src/ext/pdo_dblib/config.m4:1.3
--- php-src/ext/pdo_dblib/config.m4:1.2 Tue Jul 26 23:12:43 2005
+++ php-src/ext/pdo_dblib/config.m4 Sat Sep 24 19:22:43 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.2 2005/07/27 03:12:43 wez Exp $
+dnl $Id: config.m4,v 1.3 2005/09/24 23:22:43 sniper Exp $
 dnl
 
 if test $PHP_PDO != no; then
@@ -73,7 +73,7 @@
   AC_DEFINE(HAVE_FREETDS,1,[ ])
   PHP_SUBST(PDO_DBLIB_SHARED_LIBADD)
 
-  ifdef([PHP_ADD_EXTENDION_DEP],
+  ifdef([PHP_ADD_EXTENSION_DEP],
   [
 PHP_ADD_EXTENSION_DEP(pdo_dblib, pdo)
   ])
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/config.m4?r1=1.25r2=1.26ty=u
Index: php-src/ext/pdo_mysql/config.m4
diff -u php-src/ext/pdo_mysql/config.m4:1.25 
php-src/ext/pdo_mysql/config.m4:1.26
--- php-src/ext/pdo_mysql/config.m4:1.25Tue Jul 26 22:39:46 2005
+++ php-src/ext/pdo_mysql/config.m4 Sat Sep 24 19:22:43 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.25 2005/07/27 02:39:46 wez Exp $
+dnl $Id: config.m4,v 1.26 2005/09/24 23:22:43 sniper Exp $
 dnl
 
 if test $PHP_PDO != no; then
@@ -79,7 +79,7 @@
   ])
 
   PHP_NEW_EXTENSION(pdo_mysql, pdo_mysql.c mysql_driver.c mysql_statement.c, 
$ext_shared,,-I$pdo_inc_path)
-  ifdef([PHP_ADD_EXTENDION_DEP],
+  ifdef([PHP_ADD_EXTENSION_DEP],
   [
PHP_ADD_EXTENSION_DEP(pdo_mysql, pdo)
   ])
http://cvs.php.net/diff.php/php-src/ext/pdo_oci/config.m4?r1=1.14r2=1.15ty=u
Index: php-src/ext/pdo_oci/config.m4
diff -u php-src/ext/pdo_oci/config.m4:1.14 php-src/ext/pdo_oci/config.m4:1.15
--- php-src/ext/pdo_oci/config.m4:1.14  Tue Jul 26 23:48:08 2005
+++ php-src/ext/pdo_oci/config.m4   Sat Sep 24 19:22:43 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.14 2005/07/27 03:48:08 wez Exp $
+dnl $Id: config.m4,v 1.15 2005/09/24 23:22:43 sniper Exp $
 
 if test $PHP_PDO != no; then
 
@@ -199,7 +199,7 @@
   PHP_SUBST_OLD(PDO_OCI_DIR)
   PHP_SUBST_OLD(PDO_OCI_VERSION)
 
-  ifdef([PHP_ADD_EXTENDION_DEP],
+  ifdef([PHP_ADD_EXTENSION_DEP],
   [
 PHP_ADD_EXTENSION_DEP(pdo_oci, pdo)
   ])
http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/config.m4?r1=1.27r2=1.28ty=u
Index: php-src/ext/pdo_sqlite/config.m4
diff -u php-src/ext/pdo_sqlite/config.m4:1.27 
php-src/ext/pdo_sqlite/config.m4:1.28
--- php-src/ext/pdo_sqlite/config.m4:1.27   Sun Aug 28 12:56:58 2005
+++ php-src/ext/pdo_sqlite/config.m4Sat Sep 24 19:22:44 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.27 2005/08/28 16:56:58 iliaa Exp $
+dnl $Id: config.m4,v 1.28 2005/09/24 23:22:44 sniper Exp $
 dnl config.m4 for extension pdo_sqlite
 dnl vim:et:sw=2:ts=2:
 
@@ -113,7 +113,7 @@
   AC_CHECK_HEADERS(time.h)
 
   fi
-  ifdef([PHP_ADD_EXTENDION_DEP],
+  ifdef([PHP_ADD_EXTENSION_DEP],
   [
 PHP_ADD_EXTENSION_DEP(pdo_sqlite, pdo)
   ])

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

[PHP-CVS] cvs: php-src /ext/pdo_dblib config.m4 dblib_driver.c pdo_dblib.c php_pdo_dblib_int.h

2005-07-12 Thread Wez Furlong

wez Tue Jul 12 08:16:02 2005 EDT

  Added files: 
/php-src/ext/pdo_dblib  config.m4 

  Modified files:  
/php-src/ext/pdo_dblib  dblib_driver.c pdo_dblib.c 
php_pdo_dblib_int.h 
  Log:
  Enable unix build for dblib/sybase/freetds.
  The extension is named pdo_dblib and the driver dblib on unix.
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_dblib/dblib_driver.c?r1=1.7r2=1.8ty=u
Index: php-src/ext/pdo_dblib/dblib_driver.c
diff -u php-src/ext/pdo_dblib/dblib_driver.c:1.7 
php-src/ext/pdo_dblib/dblib_driver.c:1.8
--- php-src/ext/pdo_dblib/dblib_driver.c:1.7Sun Feb  6 17:28:50 2005
+++ php-src/ext/pdo_dblib/dblib_driver.cTue Jul 12 08:16:02 2005
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: dblib_driver.c,v 1.7 2005/02/06 22:28:50 wez Exp $ */
+/* $Id: dblib_driver.c,v 1.8 2005/07/12 12:16:02 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include config.h
@@ -257,8 +257,10 @@
 pdo_driver_t pdo_dblib_driver = {
 #if PDO_DBLIB_IS_MSSQL
PDO_DRIVER_HEADER(mssql),
-#else
+#elif defined(PHP_WIN32)
PDO_DRIVER_HEADER(sybase),
+#else
+   PDO_DRIVER_HEADER(dblib),
 #endif
pdo_dblib_handle_factory
 };
http://cvs.php.net/diff.php/php-src/ext/pdo_dblib/pdo_dblib.c?r1=1.5r2=1.6ty=u
Index: php-src/ext/pdo_dblib/pdo_dblib.c
diff -u php-src/ext/pdo_dblib/pdo_dblib.c:1.5 
php-src/ext/pdo_dblib/pdo_dblib.c:1.6
--- php-src/ext/pdo_dblib/pdo_dblib.c:1.5   Tue Jul 12 07:02:23 2005
+++ php-src/ext/pdo_dblib/pdo_dblib.c   Tue Jul 12 08:16:02 2005
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: pdo_dblib.c,v 1.5 2005/07/12 11:02:23 wez Exp $ */
+/* $Id: pdo_dblib.c,v 1.6 2005/07/12 12:16:02 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include config.h
@@ -42,8 +42,10 @@
STANDARD_MODULE_HEADER,
 #if PDO_DBLIB_IS_MSSQL
pdo_mssql,
-#else
+#elif define (PHP_WIN32)
pdo_sybase,
+#else
+   pdo_dblib
 #endif
pdo_dblib_functions,
PHP_MINIT(pdo_dblib),
@@ -197,7 +199,7 @@
 #elif defined(PHP_WIN32)
FreeTDS/Sybase/MSSQL
 #else
-   Sybase
+   FreeTDS/Sybase
 #endif
 DB-lib, enabled);
php_info_print_table_row(2, Flavour, PDO_DBLIB_FLAVOUR);
http://cvs.php.net/diff.php/php-src/ext/pdo_dblib/php_pdo_dblib_int.h?r1=1.3r2=1.4ty=u
Index: php-src/ext/pdo_dblib/php_pdo_dblib_int.h
diff -u php-src/ext/pdo_dblib/php_pdo_dblib_int.h:1.3 
php-src/ext/pdo_dblib/php_pdo_dblib_int.h:1.4
--- php-src/ext/pdo_dblib/php_pdo_dblib_int.h:1.3   Tue Jan 18 02:17:01 2005
+++ php-src/ext/pdo_dblib/php_pdo_dblib_int.h   Tue Jul 12 08:16:02 2005
@@ -17,11 +17,15 @@
   +--+
 */
 
-/* $Id: php_pdo_dblib_int.h,v 1.3 2005/01/18 07:17:01 fmk Exp $ */
+/* $Id: php_pdo_dblib_int.h,v 1.4 2005/07/12 12:16:02 wez Exp $ */
 
 #ifndef PHP_PDO_DBLIB_INT_H
 #define PHP_PDO_DBLIB_INT_H
 
+#ifndef PDO_DBLIB_FLAVOUR
+# define PDO_DBLIB_FLAVOUR Generic DB-lib
+#endif
+
 #if PHP_DBLIB_IS_MSSQL
 # include sqlfront.h
 # include sqldb.h

http://cvs.php.net/co.php/php-src/ext/pdo_dblib/config.m4?r=1.1p=1
Index: php-src/ext/pdo_dblib/config.m4
+++ php-src/ext/pdo_dblib/config.m4
dnl
dnl $Id: config.m4,v 1.1 2005/07/12 12:16:02 wez Exp $
dnl

if test $PHP_PDO != no; then
PHP_ARG_WITH(pdo-dblib, for PDO_DBLIB support via FreeTDS,
[  --with-pdo-dblib[=DIR]  Include PDO_DBLIB-DB support.  DIR is the 
FreeTDS home
  directory])


if test $PHP_PDO_DBLIB != no; then

  PDO_FREETDS_INSTALLATION_DIR=
  if test $PHP_PDO_DBLIB = yes; then

for i in /usr/local /usr; do
  if test -f $i/include/tds.h; then
PDO_FREETDS_INSTALLATION_DIR=$i
break
  fi
done

if test -z $PDO_FREETDS_INSTALLATION_DIR; then
  AC_MSG_ERROR(Cannot find FreeTDS in known installation directories)
fi

  elif test $PHP_PDO_DBLIB != no; then

if test -f $PHP_PDO_DBLIB/include/tds.h; then
  PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB
else
  AC_MSG_ERROR(Directory $PHP_PDO_DBLIB is not a FreeTDS installation 
directory)
fi
  fi  

  if test ! -r $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.a  test ! 
-r $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.so; then
 AC_MSG_ERROR(Could not find 
$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.[a|so])
  fi

  PDO_DBLIB_INCDIR=$PDO_FREETDS_INSTALLATION_DIR/include
  PDO_DBLIB_LIBDIR=$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR

  PHP_ADD_INCLUDE($PDO_DBLIB_INCDIR)
  PHP_ADD_LIBRARY_WITH_PATH(sybdb, $PDO_DBLIB_LIBDIR, PDO_DBLIB_SHARED_LIBADD)
  PHP_CHECK_PDO_INCLUDES
  PDO_DBLIB_DEFS=-DPDO_DBLIB_FLAVOUR=\\\freetds\\\
  PHP_NEW_EXTENSION(pdo_dblib, pdo_dblib.c dblib_driver.c dblib_stmt.c, 
$ext_shared,,-I$pdo_inc_path $PDO_DBLIB_DEFS)
  AC_CHECK_LIB(dnet_stub, dnet_addr,
 [

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

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

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

[PHP-CVS] cvs: php-src /ext/pdo_dblib config.m4 dblib_driver.c pdo_dblib.c php_pdo_dblib_int.h

4 matches

Site Navigation

Mail list logo

Footer information